Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	configure.ac
	debian/changelog
	doc/apt-verbatim.ent
	doc/po/apt-doc.pot
	doc/po/de.po
	doc/po/es.po
	doc/po/fr.po
	doc/po/it.po
	doc/po/ja.po
	doc/po/pl.po
	doc/po/pt.po
	doc/po/pt_BR.po
	po/apt-all.pot
	po/ar.po
	po/ast.po
	po/bg.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/dz.po
	po/el.po
	po/es.po
	po/eu.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/hu.po
	po/it.po
	po/ja.po
	po/km.po
	po/ko.po
	po/ku.po
	po/lt.po
	po/mr.po
	po/nb.po
	po/ne.po
	po/nl.po
	po/nn.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/sk.po
	po/sl.po
	po/sv.po
	po/th.po
	po/tl.po
	po/tr.po
	po/uk.po
	po/vi.po
	po/zh_CN.po
	po/zh_TW.po

167 files changed, 78815 insertions, 73887 deletions

diff --git a/.travis.yml b/.travis.yml
index 2852db483..b449aeba5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,4 @@ language: cpp
 before_install:
  - sudo apt-get update -q
  - sudo ./prepare-release travis-ci
- - sudo apt-get install -q --no-install-recommends stunnel4 db-util
 script: make && make test && test/integration/run-tests
diff --git a/COMPILING b/COMPILING
index 1076c6366..93e628037 100644
--- a/COMPILING
+++ b/COMPILING
@@ -53,7 +53,7 @@ Debian GNU Linux 'potato'
 Debian GNU Linux 'woody'
   * All Archs
   - Works flawlessly
-  - You will want to have debiandoc-sgml and docbook2man installed to get
+  - You will want to have docbook-xml and docbook2man installed to get
     best results.
   - No IPv6 Support in glibc's < 2.1.
 
diff --git a/Makefile b/Makefile
index 394149bf1..6e1edbd5f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ endif
 default: startup all
 
 .PHONY: headers library clean veryclean all binary program doc test update-po
-all headers library clean veryclean binary program doc manpages debiandoc test update-po startup dirs:
+all headers library clean veryclean binary program doc manpages docbook test update-po startup dirs:
 	$(MAKE) -C vendor $@
 	$(MAKE) -C apt-pkg $@
 	$(MAKE) -C apt-inst $@
@@ -23,7 +23,7 @@ all headers library clean veryclean binary program doc manpages debiandoc test u
 	$(MAKE) -C po $@
 	$(MAKE) -C test $@
 
-all headers library clean veryclean binary program doc manpages debiandoc test update-po: startup dirs
+all headers library clean veryclean binary program doc manpages docbook test update-po: startup dirs
 
 dirs: startup
 
diff --git a/README.ddtp b/README.ddtp
deleted file mode 100644
index 5865b4e02..000000000
--- a/README.ddtp
+++ /dev/null
@@ -1,74 +0,0 @@
-TODO:
-- URL-Remap for the translation files (to hack around the problem that
-  they are not on any ftp server yet but only on http://ddtp.debian.org/)
-
-Here is the original announcement of the ddtp support:
-
-* To: debian-devel-announce@lists.debian.org
-* Subject: Translate files
-* From: Michael Bramer <grisu@debian.org>
-* Date: Sun, 6 Oct 2002 21:56:06 +0200
-* Mail-followup-to: debian-devel@lists.debian.org
-* Message-id: <20021006195605.GA30516@home.debsupport.de>
-* Old-return-path: <michael@home.debsupport.de>
-* User-agent: Mutt/1.3.28i
-
-Hello all
-
-After some discussion between Anthony Towns (a ftpmaster), Jason
-Gunthorpe (APT Developer) and some DDTP Coordinators we find a way to
-transfer the translated package descriptions from the archive to the
-user. 
-
-The translated descriptions need to be downloadable befor any
-installation process, like the other package meta information. We
-choose a new file per languages with all translated package
-descriptions. The package system can download one or more of this
-files at 'apt-get update' time and know the translations.
-
-The new files are names 'Translate-$lang' and the file have this
-rfc822-format:
-  Package: &lt;package-name&gt;
-  Description-md5: &lt;the md5 checksum of the english description&gt;
-  Description-$lang.$encoding: &lt;translated headline&gt;
-   &lt;translated section&gt;
-
-The encoding of the Description is 'UTF-8' in all languages normal.
-The files will be located at 'debian/dists/sid/main/i18n/' on the ftp
-server (for all architecture). In addition of the plain
-'Translate-$lang' file, there will be a 'gz' and a 'bz2' version and
-in future also the new incremental format version.
-
-The &lt;the md5 checksum of the english description&gt; is the md5 checksum
-of the full english description, without the 'Description: '-tag and
-with all spaces and newlines. Look at this example:
- Description: XXX
-  YYY
-  .
-  ZZZ
-is md5(&quot;XXX\n YYY\n .\n ZZZ\n&quot;) (perl-syntax).
-
-
-A future APT version will download one or some 'Translate-$lang'
-file(s) at 'update'-time. After this download it show a translated
-description instead of the english form, if it found a translated
-description of the package with the right md5 chechsum. The environment
-of the user will controlled this process (LANG, LANGUAGE, LC_MESSAGES,
-etc). With this the package system will never show a outdated
-translation.
-
-The translations come all from the DDTP. A daily process on
-ddtp.debian.org make new 'Translated-$lang' files and a script on
-ftp-master request this files and move this to the debian archive.
-Now the first files are accessible at
-	<a  href="http://ddtp.debian.org/pdesc/translatefiles/">http://ddtp.debian.org/pdesc/translatefiles/</a>
-
-If you found wrong translations, please read the guides on
-ddtp.debian.org, make a better translation and send this per mail to
-the DDTP server. Don't bug the package maintainer!
-
-Thanks
-Grisu
--- 
-Michael Bramer  -  a Debian Linux Developer      <a  href="http://www.debsupport.de">http://www.debsupport.de</a>
-PGP: finger grisu@db.debian.org  -- Linux Sysadmin   -- Use Debian Linux
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..40bb6998d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,181 @@
+APT
+===
+
+apt is the main commandline package manager for Debian and its derivatives.
+It provides commandline tools for searching and managing as well as querying
+information about packages as well as low-level access to all features
+provided by the libapt-pkg and libapt-inst libraries which higher-level
+package managers can depend upon.
+
+Included tools are:
+
+* apt-get for retrieval of packages and information about them
+  from authenticated sources and for installation, upgrade and
+  removal of packages together with their dependencies
+* apt-cache for querying available information about installed
+  as well as installable packages
+* apt-cdrom to use removable media as a source for packages
+* apt-config as an interface to the configuration settings
+* apt-key as an interface to manage authentication keys
+* apt-extracttemplates to be used by debconf to prompt for configuration
+  questions before installation.
+* apt-ftparchive creates Packages and other index files
+  needed to publish an archive of debian packages
+* apt-sortpkgs is a Packages/Sources file normalizer.
+
+The libraries libapt-pkg and libapt-inst are also maintained as part of this project,
+alongside various additional binaries like the acquire-methods used by them.
+Bindings for Python ([python-apt](https://tracker.debian.org/pkg/python-apt)) and
+Perl ([libapt-pkg-perl](https://tracker.debian.org/pkg/libapt-pkg-perl)) are available as separated projects.
+
+Discussion happens mostly on [the mailinglist](mailto:deity@lists.debian.org) ([archive](https://lists.debian.org/deity/)) and on [IRC](irc://irc.oftc.net/debian-apt).
+Our bugtracker as well as a general overview can be found at the [Debian Tracker page](https://tracker.debian.org/pkg/apt).
+
+
+Contributing
+------------
+APT is maintained in git, the official repository being located at
+`git://anonscm.debian.org/apt/apt.git` ([webgit](http://anonscm.debian.org/gitweb/?p=apt/apt.git)),
+but also available at other locations like [GitHub](https://github.com/Debian/apt).
+
+The default branch is `debian/sid`, other branches targeted at different
+derivatives and releases being used as needed. Various topic branches in
+different stages of completion might be branched of from those, which you
+are encouraged to do as well.
+
+### Coding
+
+APT uses its own autoconf based build system, see [README.make](http://anonscm.debian.org/gitweb/?p=apt/apt.git;a=blob;f=README.make)
+for the glory details, but to get started, just run:
+
+	$ make
+
+from a fresh git checkout.
+
+The source code uses in most parts a relatively uncommon indent convention,
+namely 3 spaces with 8 space tab (see [doc/style.txt](http://anonscm.debian.org/gitweb/?p=apt/apt.git;a=blob;f=doc/style.txt) for more on this).
+Adhering to it avoids unnecessary code-churn destroying history (aka: `git blame`)
+and you are therefore encouraged to write patches in this style.
+Your editor can surely help you with this, for vim the settings would be
+`setlocal shiftwidth=3 noexpandtab tabstop=8`
+(the later two are the default configuration and could therefore be omitted).
+
+### Translations
+
+While we welcome contributions here, we highly encourage you to contact the [Debian Internationalization (i18n) team](https://wiki.debian.org/Teams/I18n).
+Various language teams have formed which can help you creating, maintaining
+and improving a translation, while we could only do a basic syntax check of the
+file format…
+
+Further more, Translating APT is split into two independent parts:
+The program translation, meaning the messages printed by the tools,
+as well as the manpages and other documentation shipped with APT.
+
+### Bug triage
+
+Software tools like APT which are used by thousands of users every
+day have a steady flow of incoming bugreports. Not all of them are really
+bugs in APT: It can be packaging bugs like failing maintainer scripts a
+user reports against apt, because apt was the command he executed leading
+to this failure or various wishlist items for new features. Given enough time
+also the occasional duplicate enters the system.
+Our bugtracker is therefore full with open bugreports which are waiting for you! ;)
+
+Testing
+-------
+
+### Manual execution
+
+When you make changes and want to run them manually, make sure your
+`$LD_LIBRARY_PATH` points to the libraries you have built, e.g. via:
+
+	$ export LD_LIBRARY_PATH=$(pwd)/build/bin
+	$ ./build/bin/apt-get moo
+
+
+### Integration tests
+
+There is a extensive integration testsuite available which can be run via:
+
+	$ ./test/integration/run-tests
+
+While these tests are not executed at package build-time as they require additional
+dependencies, the repository contains the configuration needed to run them on [Travis CI](https://travis-ci.org/)
+as well as via autopkgtests e.g. on [Debian Continuous Integration](http://ci.debian.net/?q=apt#package/apt).
+
+A testcase here is a shellscript embedded in a framework creating an environment in which
+apt tools can be used naturally without root-rights to test every aspect of its behavior
+itself as well as in conjunction with dpkg and other tools while working with packages.
+
+
+### Unit tests
+
+These tests are gtest-dev based, reside in `./test/libapt` and can be run with `make test`.
+They are executed at package build-time, but not by `make`.
+
+Debugging
+---------
+
+APT does many things, so there is no central debug mode which could be
+activated. It uses instead various config-options to activate debug output
+in certain areas. The following describes some common scenarios and generally
+useful options, but is in no way exhaustive.
+
+Note that you should *NEVER* use these settings as root to avoid accidents.
+Similation mode (`-s`) is usually sufficient to help you run apt as a non-root user.
+
+### Using different state files
+
+If a dependency solver bug is reported, but can't be reproduced by the
+triager easily, it is beneficial to ask the reporter for the
+`/var/lib/dpkg/status` file, which includes the packages installed on the
+system and in which version. Such a file can then be used via the option
+`dir::state::status`. Beware of different architecture settings!
+Bugreports usually include this information in the template. Assuming you
+already have the `Packages` files for the architecture (see `sources.list`
+manpage for the `arch=` option) you can change to a different architecture
+with a config file like:
+
+	APT::Architecture "arch1";
+	#clear APT::Architectures;
+	APT:: Architectures { "arch1"; "arch2"; }
+
+If a certain mirror state is needed, see if you can reproduce it with [snapshot.debian.org](http://snapshot.debian.org/).
+Your sources.list file (`dir::etc::sourcelist`) has to be correctly mention the repository,
+but if it does, you can use different downloaded archive state files via `dir::state::lists`.
+
+In case manually vs. automatically installed matters, you can ask the reporter for
+the `/var/lib/apt/extended_states` file and use it with `dir::state::extended_states`.
+
+### Dependency resolution
+
+APT works in its internal resolver in two stages: First all packages are visited
+and marked for installation, keep back or removal. Option `Debug::pkgDepCache::Marker`
+shows this. This also decides which packages are to be installed to satisfy dependencies,
+which can be seen by `Debug::pkgDepCache::AutoInstall`. After this is done, we might
+be in a situation in which two packages want to be installed, but only on of them can be.
+It is the job of the pkgProblemResolver to decide which of two packages 'wins' and can
+therefore decide what has to happen. You can see the contenders as well as their fight and
+the resulting resolution with `Debug::pkgProblemResolver`.
+
+### Downloading files
+
+Various binaries (called 'methods') are tasked with downloading files. The Acquire system
+talks to them via simple text protocol. Depending on which side you want to see, either
+`Debug::pkgAcquire::Worker` or `Debug::Acquire::http` (or similar) will show the messages.
+
+The integration tests use a simple self-built webserver which also logs. If you find that
+the http(s) methods do not behave like they should be try to implement this behavior in the
+webserver for simpler and more controlled testing.
+
+### Installation order
+
+Dependencies are solved, packages downloaded: Everything read for the installation!
+The last step in the chain is often forgotten, but still very important:
+Packages have to be installed in a particular order so that their dependencies are
+satisfied, but at the same time you don't want to install very important and optional
+packages at the same time if possible, so that a broken optional package does not
+block the correct installation of very important packages. Which option to use depends on
+if you are interested in the topology sorting (`Debug::pkgOrderList`), the dependency-aware
+cycle and unconfigured prevention (`Debug::pkgPackageManager`) or the actual calls
+to dpkg (`Debug::pkgDpkgPm`).
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 0178456a8..6cb9b012a 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -356,7 +356,7 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
    Desc.URI = URI + ".diff/Index";
 
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
-   DestFile += URItoFileName(URI) + string(".DiffIndex");
+   DestFile += URItoFileName(Desc.URI);
 
    if(Debug)
       std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl;
@@ -392,7 +392,7 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
 string pkgAcqDiffIndex::Custom600Headers()
 {
    string Final = _config->FindDir("Dir::State::lists");
-   Final += URItoFileName(RealURI) + string(".IndexDiff");
+   Final += URItoFileName(Desc.URI);
    
    if(Debug)
       std::clog << "Custom600Header-IMS: " << Final << std::endl;
@@ -932,8 +932,6 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
    }
    CompressionExtension = comprExt;
 
-   Verify = true;
-
    Init(URI, URIDesc, ShortDesc);
 }
 pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, IndexTarget const *Target,
@@ -957,13 +955,6 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, IndexTarget const *Target,
    if (CompressionExtension.empty() == false)
       CompressionExtension.erase(CompressionExtension.end()-1);
 
-   // only verify non-optional targets, see acquire-item.h for a FIXME
-   // to make this more flexible
-   if (Target->IsOptional())
-     Verify = false;
-   else
-     Verify = true;
-
    Init(Target->URI, Target->Description, Target->ShortDesc);
 }
 									/*}}}*/
@@ -1056,23 +1047,24 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
          return;
       }
 
-      /* Verify the index file for correctness (all indexes must
-       * have a Package field) (LP: #346386) (Closes: #627642) */
-      if (Verify == true)
+      // FIXME: this can go away once we only ever download stuff that
+      //        has a valid hash and we never do GET based probing
+      //
+      /* Always verify the index file for correctness (all indexes must
+       * have a Package field) (LP: #346386) (Closes: #627642) 
+       */
+      FileFd fd(DestFile, FileFd::ReadOnly);
+      // Only test for correctness if the file is not empty (empty is ok)
+      if (fd.FileSize() > 0)
       {
-	 FileFd fd(DestFile, FileFd::ReadOnly);
-	 // Only test for correctness if the file is not empty (empty is ok)
-	 if (fd.FileSize() > 0)
-	 {
-	    pkgTagSection sec;
-	    pkgTagFile tag(&fd);
-
-	    // all our current indexes have a field 'Package' in each section
-	    if (_error->PendingError() == true || tag.Step(sec) == false || sec.Exists("Package") == false)
-	    {
-	       RenameOnError(InvalidFormat);
-	       return;
-	    }
+         pkgTagSection sec;
+         pkgTagFile tag(&fd);
+         
+         // all our current indexes have a field 'Package' in each section
+         if (_error->PendingError() == true || tag.Step(sec) == false || sec.Exists("Package") == false)
+         {
+            RenameOnError(InvalidFormat);
+            return;
          }
       }
        
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index f48d2a0d7..06537bf2c 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -685,15 +685,8 @@ class pkgAcqIndex : public pkgAcquire::Item
     */
    bool Erase;
 
-   /** \brief Verify for correctness by checking if a "Package"
-    *         tag is found in the index. This can be set to
-    *         false for optional index targets
-    *       
-    */
-   // FIXME: instead of a bool it should use a verify string that will
-   //        then be used in the pkgAcqIndex::Done method to ensure that
-   //        the downloaded file contains the expected tag
-   bool Verify;
+   // Unused, used to be used to verify that "Packages: " header was there
+   bool __DELME_ON_NEXT_ABI_BREAK_Verify;
 
    /** \brief The download request that is currently being
     *   processed.
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index a187a00ae..057bc24cd 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -486,6 +486,9 @@ bool pkgAcquire::Clean(string Dir)
    if (DirectoryExists(Dir) == false)
       return true;
 
+   if(Dir == "/")
+      return _error->Error(_("Clean of %s is not supported"), Dir.c_str());
+
    DIR *D = opendir(Dir.c_str());   
    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 0fd40106f..ea3d45480 100644
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -143,6 +143,9 @@ bool pkgCacheFile::BuildDepCache(OpProgress *Progress)
    if (DCache != NULL)
       return true;
 
+   if (BuildPolicy(Progress) == false)
+      return false;
+
    DCache = new pkgDepCache(Cache,Policy);
    if (_error->PendingError() == true)
       return false;
diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h
index 49d2855f5..6d10d1163 100644
--- a/apt-pkg/cachefilter.h
+++ b/apt-pkg/cachefilter.h
@@ -73,6 +73,7 @@ public:
 	bool operator() (pkgCache::VerIterator const &Ver);
 	~PackageArchitectureMatchesSpecification();
 };
+									/*}}}*/
 
 #else
 
diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 0ee3b765d..37128e9aa 100644
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -34,7 +34,10 @@
 bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
 {
    bool CleanInstalled = _config->FindB("APT::Clean-Installed",true);
-      
+
+   if(Dir == "/")
+      return _error->Error(_("Clean of %s is not supported"), Dir.c_str());
+
    DIR *D = opendir(Dir.c_str());
    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
diff --git a/apt-pkg/contrib/proxy.cc b/apt-pkg/contrib/proxy.cc
new file mode 100644
index 000000000..b58db8478
--- /dev/null
+++ b/apt-pkg/contrib/proxy.cc
@@ -0,0 +1,82 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* ######################################################################
+   
+   Proxy - Proxy releated functions
+   
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#include<apt-pkg/configuration.h>
+#include<apt-pkg/error.h>
+#include<apt-pkg/fileutl.h>
+#include<apt-pkg/strutl.h>
+
+#include<iostream>
+#include <unistd.h>
+
+#include "proxy.h"
+
+
+// AutoDetectProxy - auto detect proxy          			/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool AutoDetectProxy(URI &URL)
+{
+   // we support both http/https debug options
+   bool Debug = _config->FindB("Debug::Acquire::"+URL.Access,false);
+
+   // option is "Acquire::http::Proxy-Auto-Detect" but we allow the old
+   // name without the dash ("-")
+   std::string AutoDetectProxyCmd = _config->Find("Acquire::"+URL.Access+"::Proxy-Auto-Detect",
+                                      _config->Find("Acquire::"+URL.Access+"::ProxyAutoDetect"));
+
+   if (AutoDetectProxyCmd.empty())
+      return true;
+
+   if (Debug)
+      std::clog << "Using auto proxy detect command: " << AutoDetectProxyCmd << std::endl;
+
+   int Pipes[2] = {-1,-1};
+   if (pipe(Pipes) != 0)
+      return _error->Errno("pipe", "Failed to create Pipe");
+
+   pid_t Process = ExecFork();
+   if (Process == 0)
+   {
+      close(Pipes[0]);
+      dup2(Pipes[1],STDOUT_FILENO);
+      SetCloseExec(STDOUT_FILENO,false);
+
+      std::string foo = URL;
+      const char *Args[4];
+      Args[0] = AutoDetectProxyCmd.c_str();
+      Args[1] = foo.c_str();
+      Args[2] = 0;
+      execv(Args[0],(char **)Args);
+      std::cerr << "Failed to exec method " << Args[0] << std::endl;
+      _exit(100);
+   }
+   char buf[512];
+   int InFd = Pipes[0];
+   close(Pipes[1]);
+   int res = read(InFd, buf, sizeof(buf)-1);
+   ExecWait(Process, "ProxyAutoDetect", true);
+
+   if (res < 0)
+      return _error->Errno("read", "Failed to read");
+   if (res == 0)
+      return _error->Warning("ProxyAutoDetect returned no data");
+
+   // add trailing \0
+   buf[res] = 0;
+
+   if (Debug)
+      std::clog << "auto detect command returned: '" << buf << "'" << std::endl;
+
+   if (strstr(buf, URL.Access.c_str()) == buf)
+      _config->Set("Acquire::"+URL.Access+"::proxy::"+URL.Host, _strstrip(buf));
+
+   return true;
+}
+									/*}}}*/
diff --git a/apt-pkg/contrib/proxy.h b/apt-pkg/contrib/proxy.h
new file mode 100644
index 000000000..2cbcd07b4
--- /dev/null
+++ b/apt-pkg/contrib/proxy.h
@@ -0,0 +1,16 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* ######################################################################
+   
+   Proxy - Proxy operations
+   
+   ##################################################################### */
+									/*}}}*/
+#ifndef PKGLIB_PROXY_H
+#define PKGLIB_PROXY_H
+
+class URI;
+bool AutoDetectProxy(URI &URL);
+
+
+#endif
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 2100ee47b..87f57a30e 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -45,14 +45,26 @@ using namespace std;
 // ---------------------------------------------------------------------
 namespace APT {
    namespace String {
-std::string Strip(const std::string &s)
+std::string Strip(const std::string &str)
 {
-   size_t start = s.find_first_not_of(" \t\n");
-   // only whitespace
-   if (start == string::npos)
+   // ensure we have at least one character
+   if (str.empty() == true)
+      return str;
+
+   char const * const s = str.c_str();
+   size_t start = 0;
+   for (; isspace(s[start]) != 0; ++start)
+      ; // find the first not-space
+
+   // string contains only whitespaces
+   if (s[start] == '\0')
       return "";
-   size_t end = s.find_last_not_of(" \t\n");
-   return s.substr(start, end-start+1);
+
+   size_t end = str.length() - 1;
+   for (; isspace(s[end]) != 0; --end)
+      ; // find the last not-space
+
+   return str.substr(start, end - start + 1);
 }
 
 bool Endswith(const std::string &s, const std::string &end)
@@ -434,23 +446,30 @@ string TimeToStr(unsigned long Sec)
 /* This replaces all occurrences of Subst with Contents in Str. */
 string SubstVar(const string &Str,const string &Subst,const string &Contents)
 {
+   if (Subst.empty() == true)
+      return Str;
+
    string::size_type Pos = 0;
    string::size_type OldPos = 0;
    string Temp;
-   
-   while (OldPos < Str.length() && 
+
+   while (OldPos < Str.length() &&
 	  (Pos = Str.find(Subst,OldPos)) != string::npos)
    {
-      Temp += string(Str,OldPos,Pos) + Contents;
-      OldPos = Pos + Subst.length();      
+      if (OldPos != Pos)
+	 Temp.append(Str, OldPos, Pos - OldPos);
+      if (Contents.empty() == false)
+	 Temp.append(Contents);
+      OldPos = Pos + Subst.length();
    }
-   
+
    if (OldPos == 0)
       return Str;
-   
+
+   if (OldPos >= Str.length())
+      return Temp;
    return Temp + string(Str,OldPos);
 }
-
 string SubstVar(string Str,const struct SubstVar *Vars)
 {
    for (; Vars->Subst != 0; Vars++)
@@ -697,9 +716,12 @@ string LookupTag(const string &Message,const char *Tag,const char *Default)
    then returns the result. Several varients on true/false are checked. */
 int StringToBool(const string &Text,int Default)
 {
-   char *End;
-   int Res = strtol(Text.c_str(),&End,0);   
-   if (End != Text.c_str() && Res >= 0 && Res <= 1)
+   char *ParseEnd;
+   int Res = strtol(Text.c_str(),&ParseEnd,0);
+   // ensure that the entire string was converted by strtol to avoid
+   // failures on "apt-cache show -a 0ad" where the "0" is converted
+   const char *TextEnd = Text.c_str()+Text.size();
+   if (ParseEnd == TextEnd && Res >= 0 && Res <= 1)
       return Res;
    
    // Check for positives
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index a1bcfb710..7d4fd52cf 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -108,7 +108,7 @@ unsigned char debListParser::ParseMultiArch(bool const showErrors)	/*{{{*/
 {
    unsigned char MA;
    string const MultiArch = Section.FindS("Multi-Arch");
-   if (MultiArch.empty() == true)
+   if (MultiArch.empty() == true || MultiArch == "no")
       MA = pkgCache::Version::None;
    else if (MultiArch == "same") {
       if (ArchitectureAll() == true)
@@ -145,7 +145,8 @@ unsigned char debListParser::ParseMultiArch(bool const showErrors)	/*{{{*/
 bool debListParser::NewVersion(pkgCache::VerIterator &Ver)
 {
    // Parse the section
-   Ver->Section = UniqFindTagWrite("Section");
+   unsigned long const idxSection = UniqFindTagWrite("Section");
+   Ver->Section = idxSection;
    Ver->MultiArch = ParseMultiArch(true);
    // Archive Size
    Ver->Size = Section.FindULL("Size");
@@ -260,7 +261,10 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg,
 			       pkgCache::VerIterator &Ver)
 {
    if (Pkg->Section == 0)
-      Pkg->Section = UniqFindTagWrite("Section");
+   {
+      unsigned long const idxSection = UniqFindTagWrite("Section");
+      Pkg->Section = idxSection;
+   }
 
    string const static myArch = _config->Find("APT::Architecture");
    // Possible values are: "all", "native", "installed" and "none"
@@ -799,8 +803,8 @@ bool debListParser::ParseProvides(pkgCache::VerIterator &Ver)
 	 Start = ParseDepends(Start,Stop,Package,Version,Op);
 	 if (Start == 0)
 	    return _error->Error("Problem parsing Provides line");
-	 if (Op != pkgCache::Dep::NoOp) {
-	    _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str());
+	 if (Op != pkgCache::Dep::NoOp && Op != pkgCache::Dep::Equals) {
+	    _error->Warning("Ignoring Provides line with non-equal DepCompareOp for package %s", Package.c_str());
 	 } else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) {
 	    if (NewProvidesAllArch(Ver, Package, Version) == false)
 	       return false;
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 613a4de9f..04a13a86c 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -59,8 +59,8 @@ class pkgDPkgPMPrivate
 {
 public:
    pkgDPkgPMPrivate() : stdin_is_dev_null(false), dpkgbuf_pos(0),
-			term_out(NULL), history_out(NULL), 
-                        progress(NULL), master(-1), slave(-1)
+			term_out(NULL), history_out(NULL),
+                        progress(NULL), master(-1), slave(NULL)
    {
       dpkgbuf[0] = '\0';
    }
@@ -77,9 +77,9 @@ public:
    APT::Progress::PackageManager *progress;
 
    // pty stuff
-   struct	termios tt;
+   struct termios tt;
    int master;
-   int slave;
+   char * slave;
 
    // signals
    sigset_t sigmask;
@@ -510,7 +510,7 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
    return result;
 }
 									/*}}}*/
-// DPkgPM::DoStdin - Read stdin and pass to slave pty			/*{{{*/
+// DPkgPM::DoStdin - Read stdin and pass to master pty			/*{{{*/
 // ---------------------------------------------------------------------
 /*
 */
@@ -564,8 +564,8 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line)
       'status:   <pkg>: <pkg  qstate>'
       'status:   <pkg>:<arch>: <pkg  qstate>'
       
-      'processing: {install,configure,remove,purge,disappear,trigproc}: pkg'
-      'processing: {install,configure,remove,purge,disappear,trigproc}: trigger'
+      'processing: {install,upgrade,configure,remove,purge,disappear,trigproc}: pkg'
+      'processing: {install,upgrade,configure,remove,purge,disappear,trigproc}: trigger'
    */
 
    // we need to split on ": " (note the appended space) as the ':' is
@@ -589,12 +589,15 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line)
    std::string action;
 
    // "processing" has the form "processing: action: pkg or trigger"
-   // with action = ["install", "configure", "remove", "purge", "disappear",
-   //                "trigproc"]
+   // with action = ["install", "upgrade", "configure", "remove", "purge",
+   //                "disappear", "trigproc"]
    if (prefix == "processing")
    {
       pkgname = APT::String::Strip(list[2]);
       action = APT::String::Strip(list[1]);
+      // we don't care for the difference (as dpkg doesn't really either)
+      if (action == "upgrade")
+	 action = "install";
    }
    // "status" has the form: "status: pkg: state"
    // with state in ["half-installed", "unpacked", "half-configured", 
@@ -621,15 +624,15 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line)
    {
       if(action == "error")
       {
-         d->progress->Error(list[1], PackagesDone, PackagesTotal,
+         d->progress->Error(pkgname, PackagesDone, PackagesTotal,
                             list[3]);
          pkgFailures++;
-         WriteApportReport(list[1].c_str(), list[3].c_str());
+         WriteApportReport(pkgname.c_str(), list[3].c_str());
          return;
       }
       else if(action == "conffile-prompt")
       {
-         d->progress->ConffilePrompt(list[1], PackagesDone, PackagesTotal,
+         d->progress->ConffilePrompt(pkgname, PackagesDone, PackagesTotal,
                                      list[3]);
          return;
       }
@@ -638,27 +641,26 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line)
    // at this point we know that we should have a valid pkgname, so build all 
    // the info from it
 
-   // dpkg does not send always send "pkgname:arch" so we add it here 
-   // if needed
+   // dpkg does not always send "pkgname:arch" so we add it here if needed
    if (pkgname.find(":") == std::string::npos)
    {
-      // find the package in the group that is in a touched by dpkg
-      // if there are multiple dpkg will send us a full pkgname:arch
+      // find the package in the group that is touched by dpkg
+      // if there are multiple pkgs dpkg would send us a full pkgname:arch
       pkgCache::GrpIterator Grp = Cache.FindGrp(pkgname);
-      if (Grp.end() == false) 
+      if (Grp.end() == false)
       {
-          pkgCache::PkgIterator P = Grp.PackageList();
-          for (; P.end() != true; P = Grp.NextPkg(P))
-          {
-              if(Cache[P].Mode != pkgDepCache::ModeKeep)
-              {
-                  pkgname = P.FullName();
-                  break;
-              }
-          }
+	 pkgCache::PkgIterator P = Grp.PackageList();
+	 for (; P.end() != true; P = Grp.NextPkg(P))
+	 {
+	    if(Cache[P].Keep() == false || Cache[P].ReInstall() == true)
+	    {
+	       pkgname = P.FullName();
+	       break;
+	    }
+	 }
       }
    }
-   
+
    const char* const pkg = pkgname.c_str();
    std::string short_pkgname = StringSplit(pkgname, ":")[0];
    std::string arch = "";
@@ -697,28 +699,29 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line)
    if (prefix == "status")
    {
       vector<struct DpkgState> const &states = PackageOps[pkg];
-      const char *next_action = NULL;
       if(PackageOpsDone[pkg] < states.size())
-         next_action = states[PackageOpsDone[pkg]].state;
-      // check if the package moved to the next dpkg state
-      if(next_action && (action == next_action))
       {
-         // only read the translation if there is actually a next
-         // action
-         const char *translation = _(states[PackageOpsDone[pkg]].str);
-         std::string msg;
-
-         // we moved from one dpkg state to a new one, report that
-         PackageOpsDone[pkg]++;
-         PackagesDone++;
-
-         strprintf(msg, translation, i18n_pkgname.c_str());
-         d->progress->StatusChanged(pkgname, PackagesDone, PackagesTotal, msg);
-         
+         char const * const next_action = states[PackageOpsDone[pkg]].state;
+	 if (next_action && Debug == true)
+	    std::clog << "(parsed from dpkg) pkg: " << short_pkgname
+	       << " action: " << action << " (expected: '" << next_action << "' "
+	       << PackageOpsDone[pkg] << " of " << states.size() << ")" << endl;
+
+	 // check if the package moved to the next dpkg state
+	 if(next_action && (action == next_action))
+	 {
+	    // only read the translation if there is actually a next action
+	    char const * const translation = _(states[PackageOpsDone[pkg]].str);
+
+	    // we moved from one dpkg state to a new one, report that
+	    ++PackageOpsDone[pkg];
+	    ++PackagesDone;
+
+	    std::string msg;
+	    strprintf(msg, translation, i18n_pkgname.c_str());
+	    d->progress->StatusChanged(pkgname, PackagesDone, PackagesTotal, msg);
+	 }
       }
-      if (Debug == true) 
-         std::clog << "(parsed from dpkg) pkg: " << short_pkgname
-                   << " action: " << action << endl;
    }
 }
 									/*}}}*/
@@ -1048,60 +1051,127 @@ void pkgDPkgPM::StartPtyMagic()
 {
    if (_config->FindB("Dpkg::Use-Pty", true) == false)
    {
-      d->master = d->slave = -1;
+      d->master = -1;
+      if (d->slave != NULL)
+	 free(d->slave);
+      d->slave = NULL;
       return;
    }
 
-   // setup the pty and stuff
-   struct winsize win;
-
+   _error->PushToStack();
    // if tcgetattr for both stdin/stdout returns 0 (no error)
    // we do the pty magic
-   _error->PushToStack();
-   if (tcgetattr(STDIN_FILENO, &d->tt) == 0 &&
-       tcgetattr(STDOUT_FILENO, &d->tt) == 0)
+   if (tcgetattr(STDOUT_FILENO, &d->tt) == 0 &&
+	 tcgetattr(STDIN_FILENO, &d->tt) == 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)
-       {
-           _error->Errno("openpty", _("Can not write log (%s)"), _("Is /dev/pts mounted?"));
-           d->master = d->slave = -1;
-        } else {
-	    struct termios rtt;
-	    rtt = d->tt;
-	    cfmakeraw(&rtt);
-	    rtt.c_lflag &= ~ECHO;
-	    rtt.c_lflag |= ISIG;
+      d->master = posix_openpt(O_RDWR | O_NOCTTY);
+      if (d->master == -1)
+	 _error->Errno("posix_openpt", _("Can not write log (%s)"), _("Is /dev/pts mounted?"));
+      else if (unlockpt(d->master) == -1)
+      {
+	 _error->Errno("unlockpt", "Unlocking the slave of master fd %d failed!", d->master);
+	 close(d->master);
+	 d->master = -1;
+      }
+      else
+      {
+	 char const * const slave_name = ptsname(d->master);
+	 if (slave_name == NULL)
+	 {
+	    _error->Errno("unlockpt", "Getting name for slave of master fd %d failed!", d->master);
+	    close(d->master);
+	    d->master = -1;
+	 }
+	 else
+	 {
+	    d->slave = strdup(slave_name);
+	    if (d->slave == NULL)
+	    {
+	       _error->Errno("strdup", "Copying name %s for slave of master fd %d failed!", slave_name, d->master);
+	       close(d->master);
+	       d->master = -1;
+	    }
+	    struct winsize win;
+	    if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) < 0)
+	       _error->Errno("ioctl", "Getting TIOCGWINSZ from stdout failed!");
+	    if (ioctl(d->master, TIOCSWINSZ, &win) < 0)
+	       _error->Errno("ioctl", "Setting TIOCSWINSZ for master fd %d failed!", d->master);
+	    if (tcsetattr(d->master, TCSANOW, &d->tt) == -1)
+	       _error->Errno("tcsetattr", "Setting in Start via TCSANOW for master fd %d failed!", d->master);
+
+	    struct termios raw_tt;
+	    raw_tt = d->tt;
+	    cfmakeraw(&raw_tt);
+	    raw_tt.c_lflag &= ~ECHO;
+	    raw_tt.c_lflag |= ISIG;
 	    // block SIGTTOU during tcsetattr to prevent a hang if
 	    // the process is a member of the background process group
 	    // http://www.opengroup.org/onlinepubs/000095399/functions/tcsetattr.html
 	    sigemptyset(&d->sigmask);
 	    sigaddset(&d->sigmask, SIGTTOU);
 	    sigprocmask(SIG_BLOCK,&d->sigmask, &d->original_sigmask);
-	    tcsetattr(0, TCSAFLUSH, &rtt);
-	    sigprocmask(SIG_SETMASK, &d->original_sigmask, 0);
-        }
+	    if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw_tt) == -1)
+	       _error->Errno("tcsetattr", "Setting in Start via TCSAFLUSH for stdout failed!");
+	    sigprocmask(SIG_SETMASK, &d->original_sigmask, NULL);
+	 }
       }
-   // complain only if stdout is either a terminal (but still failed) or is an invalid
+   }
+   else
+   {
+      // complain only if stdout is either a terminal (but still failed) or is an invalid
       // descriptor otherwise we would complain about redirection to e.g. /dev/null as well.
-      else if (isatty(STDOUT_FILENO) == 1 || errno == EBADF)
-         _error->Errno("tcgetattr", _("Can not write log (%s)"), _("Is stdout a terminal?"));
+      if (isatty(STDOUT_FILENO) == 1 || errno == EBADF)
+	 _error->Errno("tcgetattr", _("Can not write log (%s)"), _("Is stdout a terminal?"));
+   }
 
-      if (_error->PendingError() == true)
-	 _error->DumpErrors(std::cerr);
-      _error->RevertToStack();
+   if (_error->PendingError() == true)
+   {
+      if (d->master != -1)
+      {
+	 close(d->master);
+	 d->master = -1;
+      }
+      _error->DumpErrors(std::cerr);
+   }
+   _error->RevertToStack();
 }
+void pkgDPkgPM::SetupSlavePtyMagic()
+{
+   if(d->master == -1)
+      return;
+
+   if (close(d->master) == -1)
+      _error->FatalE("close", "Closing master %d in child failed!", d->master);
+   if (setsid() == -1)
+      _error->FatalE("setsid", "Starting a new session for child failed!");
+
+   int const slaveFd = open(d->slave, O_RDWR);
+   if (slaveFd == -1)
+      _error->FatalE("open", _("Can not write log (%s)"), _("Is /dev/pts mounted?"));
+
+   if (ioctl(slaveFd, TIOCSCTTY, 0) < 0)
+      _error->FatalE("ioctl", "Setting TIOCSCTTY for slave fd %d failed!", slaveFd);
+   else
+   {
+      for (unsigned short i = 0; i < 3; ++i)
+	 if (dup2(slaveFd, i) == -1)
+	    _error->FatalE("dup2", "Dupping %d to %d in child failed!", slaveFd, i);
 
+      if (tcsetattr(0, TCSANOW, &d->tt) < 0)
+	 _error->FatalE("tcsetattr", "Setting in Setup via TCSANOW for slave fd %d failed!", slaveFd);
+   }
+}
 void pkgDPkgPM::StopPtyMagic()
 {
-   if(d->slave > 0)
-      close(d->slave);
+   if (d->slave != NULL)
+      free(d->slave);
+   d->slave = NULL;
    if(d->master >= 0) 
    {
-      tcsetattr(0, TCSAFLUSH, &d->tt);
+      if (tcsetattr(0, TCSAFLUSH, &d->tt) == -1)
+	 _error->FatalE("tcsetattr", "Setting in Stop via TCSAFLUSH for stdin failed!");
       close(d->master);
+      d->master = -1;
    }
 }
 
@@ -1413,22 +1483,8 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress)
       pid_t Child = ExecFork(KeepFDs);
       if (Child == 0)
       {
-         // This is the child
-	 if(d->slave >= 0 && d->master >= 0) 
-	 {
-	    setsid();
-	    int res = ioctl(d->slave, TIOCSCTTY, 0);
-            if (res < 0) {
-               std::cerr << "ioctl(TIOCSCTTY) failed for fd: " 
-                         << d->slave << std::endl;
-            } else {
-               close(d->master);
-               dup2(d->slave, 0);
-               dup2(d->slave, 1);
-               dup2(d->slave, 2);
-               close(d->slave);
-            }
-	 }
+	 // This is the child
+	 SetupSlavePtyMagic();
 	 close(fd[0]); // close the read end of the pipe
 
 	 dpkgChrootDirectory();
@@ -1668,9 +1724,10 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
    // do not report dpkg I/O errors, this is a format string, so we compare
    // the prefix and the suffix of the error with the dpkg error message
    vector<string> io_errors;
-   io_errors.push_back(string("failed to read on buffer copy for %s"));
-   io_errors.push_back(string("failed in write on buffer copy for %s"));
-   io_errors.push_back(string("short read on buffer copy for %s"));
+   io_errors.push_back(string("failed to read"));
+   io_errors.push_back(string("failed to write"));
+   io_errors.push_back(string("failed to seek"));
+   io_errors.push_back(string("unexpected end of file or stream"));
 
    for (vector<string>::iterator I = io_errors.begin(); I != io_errors.end(); ++I)
    {
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 859c74b46..2c1805015 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -110,6 +110,7 @@ class pkgDPkgPM : public pkgPackageManager
    // helper
    void BuildPackagesProgressMap();
    void StartPtyMagic();
+   void SetupSlavePtyMagic();
    void StopPtyMagic();
    
    // input processing
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index c25672d1c..42e31396b 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -663,10 +663,11 @@ void pkgDepCache::Update(OpProgress *Prog)
 {   
    iUsrSize = 0;
    iDownloadSize = 0;
-   iDelCount = 0;
    iInstCount = 0;
+   iDelCount = 0;
    iKeepCount = 0;
    iBrokenCount = 0;
+   iPolicyBrokenCount = 0;
    iBadCount = 0;
 
    // Perform the depends pass
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 6d1b68c23..0d0418e06 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -26,6 +26,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <algorithm>
 #include <iostream>
 #include <vector>
 #include <limits>
@@ -50,7 +51,12 @@ bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress)
    if (Progress != NULL)
       Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
    unsigned long p = 0;
+   std::vector<std::string> archs = APT::Configuration::getArchitectures();
    for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg)
+   {
+      std::string const arch = Pkg.Arch();
+      if (std::find(archs.begin(), archs.end(), arch) == archs.end())
+	 continue;
       for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p)
       {
 	 WriteScenarioVersion(Cache, output, Pkg, Ver);
@@ -59,6 +65,7 @@ bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress)
 	 if (Progress != NULL && p % 100 == 0)
 	    Progress->Progress(p);
       }
+   }
    return true;
 }
 									/*}}}*/
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 393f836f7..249542c68 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -372,6 +372,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
    std::list<DepIterator> needConfigure;
    do
    {
+      // Check each dependency and see if anything needs to be done
+      // so that it can be configured
       Changed = false;
       for (DepIterator D = instVer.DependsList(); D.end() == false; )
       {
@@ -383,7 +385,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 	    continue;
 	 Bad = true;
 
-	 // Check for dependencies that have not been unpacked, probably due to loops.
+         // the first pass checks if we its all good, i.e. if we have
+         // to do anything at all
 	 for (DepIterator Cur = Start; true; ++Cur)
 	 {
 	    SPtrArray<Version *> VList = Cur.AllTargets();
@@ -412,6 +415,47 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 		     std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;
 	          Bad = false;
 	       }
+	    }
+
+            if (Cur == End || Bad == false)
+	       break;
+         }
+
+         // this dependency is in a good state, so we can stop
+         if (Bad == false)
+         {
+            if (Debug)
+               std::clog << OutputInDepth(Depth) << "Found ok dep " << D.TargetPkg() << std::endl;
+            continue;
+         }
+
+	 // Check for dependencies that have not been unpacked, 
+         // probably due to loops.
+	 for (DepIterator Cur = Start; true; ++Cur)
+	 {
+	    SPtrArray<Version *> VList = Cur.AllTargets();
+
+	    for (Version **I = VList; *I != 0; ++I)
+	    {
+	       VerIterator Ver(Cache,*I);
+	       PkgIterator DepPkg = Ver.ParentPkg();
+
+	       // Check if the current version of the package is available and will satisfy this dependency
+	       if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true &&
+		   List->IsFlag(DepPkg,pkgOrderList::Removed) == false &&
+		   DepPkg.State() == PkgIterator::NeedsNothing)
+                  continue;
+
+	       // Check if the version that is going to be installed will satisfy the dependency
+	       if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false)
+		  continue;
+
+	       if (PkgLoop == true)
+	       {
+		  if (Debug)
+		     std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;
+	          Bad = false;
+	       }
 	       else
 	       {
 		  if (Debug)
@@ -419,6 +463,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 		  if (NonLoopingSmart(UNPACK_IMMEDIATE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false)
 		     return false;
 	       }
+               // at this point we either unpacked a Dep or we are in a loop,
+               // no need to unpack a second one
 	       break;
 	    }
 
@@ -435,6 +481,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
          return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (1) for %s, aborting", Pkg.FullName().c_str());
    } while (Changed == true);
 
+   // now go over anything that needs configuring
    Bad = false, Changed = false, i = 0;
    do
    {
diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc
index 7926845c2..29b11937b 100644
--- a/apt-pkg/upgrade.cc
+++ b/apt-pkg/upgrade.cc
@@ -143,6 +143,12 @@ static bool pkgAllUpgradeNoNewPackages(pkgDepCache &Cache)
  */
 static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache)
 {
+   std::string const solver = _config->Find("APT::Solver", "internal");
+   if (solver != "internal") {
+      OpTextProgress Prog(*_config);
+      return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog);
+   }
+
    pkgDepCache::ActionGroup group(Cache);
 
    pkgProblemResolver Fix(&Cache);
diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc
index e37e7b227..eb77be274 100644
--- a/apt-private/private-cacheset.cc
+++ b/apt-private/private-cacheset.cc
@@ -14,74 +14,77 @@
 
 #include <apti18n.h>
 
-bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
-                                 LocalitySortedVersionSet &output_set,
-                                 OpProgress &progress)
+bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
+                                 APT::VersionContainerInterface * const vci,
+                                 OpProgress * const progress)
 {
     Matcher null_matcher = Matcher();
-    return GetLocalitySortedVersionSet(CacheFile, output_set, 
+    return GetLocalitySortedVersionSet(CacheFile, vci,
                                        null_matcher, progress);
 }
 
-bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
-                                 LocalitySortedVersionSet &output_set,
+bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
+                                 APT::VersionContainerInterface * const vci,
                                  Matcher &matcher,
-                                 OpProgress &progress)
+                                 OpProgress * const progress)
 {
    pkgCache *Cache = CacheFile.GetPkgCache();
    pkgDepCache *DepCache = CacheFile.GetDepCache();
+   APT::CacheSetHelper helper(false);
 
    int Done=0;
-   progress.SubProgress(Cache->Head().PackageCount, _("Sorting"));
+   if (progress != NULL)
+      progress->SubProgress(Cache->Head().PackageCount, _("Sorting"));
+
+   bool const insertCurrentVer = _config->FindB("APT::Cmd::Installed", false);
+   bool const insertUpgradable = _config->FindB("APT::Cmd::Upgradable", false);
+   bool const insertManualInstalled = _config->FindB("APT::Cmd::Manual-Installed", false);
+
    for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; ++P)
    {
-      if (Done%500 == 0)
-         progress.Progress(Done);
-      Done++;
+      if (progress != NULL)
+      {
+	 if (Done % 500 == 0)
+	    progress->Progress(Done);
+	 ++Done;
+      }
+
+      // exclude virtual pkgs
+      if (P->VersionList == 0)
+	 continue;
 
       if ((matcher)(P) == false)
-         continue;
+	 continue;
 
-      // exclude virtual pkgs
-      if (P.VersionList() == 0)
-         continue;
       pkgDepCache::StateCache &state = (*DepCache)[P];
-      if (_config->FindB("APT::Cmd::Installed") == true)
+      if (insertCurrentVer == true)
       {
-         if (P.CurrentVer() != NULL)
-         {
-            output_set.insert(P.CurrentVer());
-         }
+	 if (P->CurrentVer != 0)
+	    vci->FromPackage(vci, CacheFile, P, APT::VersionContainerInterface::INSTALLED, helper);
       }
-      else if (_config->FindB("APT::Cmd::Upgradable") == true)
+      else if (insertUpgradable == true)
       {
-         if(P.CurrentVer() && state.Upgradable())
-         {
-             pkgPolicy *policy = CacheFile.GetPolicy();
-             output_set.insert(policy->GetCandidateVer(P));
-         }
+	 if(P.CurrentVer() && state.Upgradable())
+	    vci->FromPackage(vci, CacheFile, P, APT::VersionContainerInterface::CANDIDATE, helper);
       }
-      else if (_config->FindB("APT::Cmd::Manual-Installed") == true)
+      else if (insertManualInstalled == true)
       {
-         if (P.CurrentVer() && 
-             ((*DepCache)[P].Flags & pkgCache::Flag::Auto) == false)
-         {
-             pkgPolicy *policy = CacheFile.GetPolicy();
-             output_set.insert(policy->GetCandidateVer(P));
-         }
+	 if (P.CurrentVer() &&
+	       ((*DepCache)[P].Flags & pkgCache::Flag::Auto) == false)
+	    vci->FromPackage(vci, CacheFile, P, APT::VersionContainerInterface::CANDIDATE, helper);
       }
-      else 
+      else
       {
-         pkgPolicy *policy = CacheFile.GetPolicy();
-         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());
+         if (vci->FromPackage(vci, CacheFile, P, APT::VersionContainerInterface::CANDIDATE, helper) == false)
+	 {
+	    // 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)
+	    vci->insert(P.VersionList());
+	 }
       }
    }
-   progress.Done();
+   if (progress != NULL)
+      progress->Done();
    return true;
 }
diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h
index 854d16922..ca8f4be5d 100644
--- a/apt-private/private-cacheset.h
+++ b/apt-private/private-cacheset.h
@@ -62,13 +62,13 @@ public:
 };
 
 // FIXME: add default argument for OpProgress (or overloaded function)
-bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
-                                    LocalitySortedVersionSet &output_set,
+bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
+                                    APT::VersionContainerInterface * const vci,
                                     Matcher &matcher,
-                                    OpProgress &progress);
-bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
-                                    LocalitySortedVersionSet &output_set,
-                                    OpProgress &progress);
+                                    OpProgress * const progress);
+bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
+                                    APT::VersionContainerInterface * const vci,
+                                    OpProgress * const progress);
 
 
 // CacheSetHelper saving virtual packages				/*{{{*/
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index a21a9dc8c..a4490f5b4 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -70,6 +70,8 @@ static bool addArgumentsAPTCache(std::vector<CommandLine::Args> &Args, char cons
    else
       return false;
 
+   bool const found_something = Args.empty() == false;
+
    // FIXME: move to the correct command(s)
    addArg('g', "generate", "APT::Cache::Generate", 0);
    addArg('t', "target-release", "APT::Default-Release", CommandLine::HasArg);
@@ -77,7 +79,8 @@ static bool addArgumentsAPTCache(std::vector<CommandLine::Args> &Args, char cons
 
    addArg('p', "pkg-cache", "Dir::Cache::pkgcache", CommandLine::HasArg);
    addArg('s', "src-cache", "Dir::Cache::srcpkgcache", CommandLine::HasArg);
-   return true;
+
+   return found_something;
 }
 									/*}}}*/
 static bool addArgumentsAPTCDROM(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
@@ -172,6 +175,8 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const
       addArg('s', "no-act", "APT::Get::Simulate", 0);
    }
 
+   bool const found_something = Args.empty() == false;
+
    // FIXME: move to the correct command(s)
    addArg('d',"download-only","APT::Get::Download-Only",0);
    addArg('y',"yes","APT::Get::Assume-Yes",0);
@@ -197,7 +202,7 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const
    addArg(0,"install-suggests","APT::Install-Suggests",CommandLine::Boolean);
    addArg(0,"fix-policy","APT::Get::Fix-Policy-Broken",0);
 
-   return true;
+   return found_something;
 }
 									/*}}}*/
 static bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index a365d4294..e08cd8057 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -19,6 +19,7 @@
 #include <apt-pkg/macros.h>
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/upgrade.h>
 
 #include <errno.h>
 #include <stdlib.h>
@@ -524,15 +525,14 @@ static bool DoAutomaticRemove(CacheFile &Cache)
 static const unsigned short MOD_REMOVE = 1;
 static const unsigned short MOD_INSTALL = 2;
 
-bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache)
+bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, int UpgradeMode)
 {
    std::map<unsigned short, APT::VersionSet> verset;
-   return DoCacheManipulationFromCommandLine(CmdL, Cache, verset);
+   return DoCacheManipulationFromCommandLine(CmdL, Cache, verset, UpgradeMode);
 }
 bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache,
-                                        std::map<unsigned short, APT::VersionSet> &verset)
+                                        std::map<unsigned short, APT::VersionSet> &verset, int UpgradeMode)
 {
-
    // Enter the special broken fixing mode if the user specified arguments
    bool BrokenFix = false;
    if (Cache->BrokenCount() != 0)
@@ -617,7 +617,17 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache,
       if (Fix != NULL)
       {
 	 // Call the scored problem resolver
-	 if (Fix->Resolve(true) == false && Cache->BrokenCount() == 0)
+	 bool resolver_fail = false;
+	 if (UpgradeMode == 0)
+	 {
+	    if (strcmp(CmdL.FileList[0], "dist-upgrade") == 0 || strcmp(CmdL.FileList[0], "full-upgrade") == 0)
+	       resolver_fail = APT::Upgrade::Upgrade(Cache, 0);
+	    else
+	       resolver_fail = Fix->Resolve(true);
+	 } else
+	    resolver_fail = APT::Upgrade::Upgrade(Cache, UpgradeMode);
+
+	 if (resolver_fail == false && Cache->BrokenCount() == 0)
 	    return false;
       }
 
@@ -676,7 +686,7 @@ bool DoInstall(CommandLine &CmdL)
 
    std::map<unsigned short, APT::VersionSet> verset;
 
-   if(!DoCacheManipulationFromCommandLine(CmdL, Cache, verset))
+   if(!DoCacheManipulationFromCommandLine(CmdL, Cache, verset, 0))
       return false;
 
    /* Print out a list of packages that are going to be installed extra
diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index 828163e40..8daa4a776 100644
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -21,8 +21,8 @@ class pkgProblemResolver;
 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);
+                                        std::map<unsigned short, APT::VersionSet> &verset, int UpgradeMode);
+bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, int UpgradeMode);
 
 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 b69002103..536348640 100644
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -85,15 +85,14 @@ private:
 };
 									/*}}}*/
 static void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,/*{{{*/
-                     pkgCache::PkgIterator P,    
-                     std::ostream &outs,
-                     bool include_summary=true)
+                     pkgCache::PkgIterator const &P, std::ostream &outs,
+                     std::string const &format)
 {
    for (pkgCache::VerIterator Ver = P.VersionList();
         Ver.end() == false; ++Ver)
    {
-      ListSingleVersion(CacheFile, records, Ver, outs, include_summary);
-      outs << "\n";
+      ListSingleVersion(CacheFile, records, Ver, outs, format);
+      outs << std::endl;
    }
 }
 									/*}}}*/
@@ -117,10 +116,9 @@ bool DoList(CommandLine &Cmd)
       patterns = Cmd.FileList + 1;
    }
 
-   std::map<std::string, std::string> output_map;
-   std::map<std::string, std::string>::const_iterator K;
-
-   bool includeSummary = _config->FindB("APT::Cmd::List-Include-Summary");
+   std::string format = "${color:highlight}${Package}${color:neutral}/${Origin} ${Version} ${Architecture}${ }${apt:Status}";
+   if (_config->FindB("APT::Cmd::List-Include-Summary", false) == true)
+      format += "\n  ${Description}\n";
 
    PackageNameMatcher matcher(patterns);
    LocalitySortedVersionSet bag;
@@ -129,37 +127,34 @@ bool DoList(CommandLine &Cmd)
                             Cache->Head().PackageCount, 
                             Cache->Head().PackageCount,
                             _("Listing"));
-   GetLocalitySortedVersionSet(CacheFile, bag, matcher, progress);
-   bool ShowAllVersions = _config->FindB("APT::Cmd::All-Versions", false);
+   GetLocalitySortedVersionSet(CacheFile, &bag, matcher, &progress);
+   bool const ShowAllVersions = _config->FindB("APT::Cmd::All-Versions", false);
+   std::map<std::string, std::string> output_map;
    for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); ++V)
    {
       std::stringstream outs;
       if(ShowAllVersions == true)
-      {
-         ListAllVersions(CacheFile, records, V.ParentPkg(), outs, includeSummary);
-         output_map.insert(std::make_pair<std::string, std::string>(
-            V.ParentPkg().Name(), outs.str()));
-      } else {
-         ListSingleVersion(CacheFile, records, V, outs, includeSummary);
-         output_map.insert(std::make_pair<std::string, std::string>(
-                           V.ParentPkg().Name(), outs.str()));
-      }
+         ListAllVersions(CacheFile, records, V.ParentPkg(), outs, format);
+      else
+         ListSingleVersion(CacheFile, records, V, outs, format);
+      output_map.insert(std::make_pair<std::string, std::string>(
+	       V.ParentPkg().Name(), outs.str()));
    }
 
    // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status)
    // output the sorted map
+   std::map<std::string, std::string>::const_iterator K;
    for (K = output_map.begin(); K != output_map.end(); ++K)
       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++;
+      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);
    }
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 8f190a551..fc76a05bc 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -118,7 +118,7 @@ static std::string GetFlagsStr(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)
    std::string flags_str;
    if (state.NowBroken())
       flags_str = "B";
-   if (P.CurrentVer() && state.Upgradable())
+   if (P.CurrentVer() && state.Upgradable() && state.CandidateVer != NULL)
       flags_str = "g";
    else if (P.CurrentVer() != NULL)
       flags_str = "i";
@@ -164,15 +164,26 @@ static std::string GetVersion(pkgCacheFile &/*CacheFile*/, pkgCache::VerIterator
 									/*}}}*/
 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();
+   if (P->CurrentVer == 0)
+   {
+      pkgDepCache * const DepCache = CacheFile.GetDepCache();
+      pkgDepCache::StateCache const &state = (*DepCache)[P];
+      if (state.CandidateVer != NULL)
+      {
+	 pkgCache::VerIterator const CandV(CacheFile, state.CandidateVer);
+	 return CandV.Arch();
+      }
+      else
+      {
+	 pkgCache::VerIterator const V = P.VersionList();
+	 if (V.end() == false)
+	    return V.Arch();
+	 else
+	    return P.Arch();
+      }
+   }
+   else
+      return P.CurrentVer().Arch();
 }
 									/*}}}*/
 static std::string GetShortDescription(pkgCacheFile &CacheFile, pkgRecords &records, pkgCache::PkgIterator P)/*{{{*/
@@ -196,80 +207,90 @@ static std::string GetShortDescription(pkgCacheFile &CacheFile, pkgRecords &reco
    return ShortDescription;
 }
 									/*}}}*/
-void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,	/*{{{*/
-                       pkgCache::VerIterator V, std::ostream &out,
-                       bool include_summary)
+static std::string GetLongDescription(pkgCacheFile &CacheFile, pkgRecords &records, pkgCache::PkgIterator P)/*{{{*/
 {
-   pkgCache::PkgIterator P = V.ParentPkg();
+   pkgPolicy *policy = CacheFile.GetPolicy();
 
-   pkgDepCache *DepCache = CacheFile.GetDepCache();
-   pkgDepCache::StateCache &state = (*DepCache)[P];
+   pkgCache::VerIterator ver;
+   if (P->CurrentVer != 0)
+      ver = P.CurrentVer();
+   else
+      ver = policy->GetCandidateVer(P);
 
-   std::string suite = GetArchiveSuite(CacheFile, V);
-   std::string name_str = P.Name();
+   std::string const EmptyDescription = "(none)";
+   if(ver.end() == true)
+      return EmptyDescription;
+
+   pkgCache::DescIterator const Desc = ver.TranslatedDescription();
+   pkgRecords::Parser & parser = records.Lookup(Desc.FileList());
+   std::string const longdesc = parser.LongDesc();
+   if (longdesc.empty() == true)
+      return EmptyDescription;
+   return SubstVar(longdesc, "\n ", "\n  ");
+}
+									/*}}}*/
+void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,	/*{{{*/
+                       pkgCache::VerIterator const &V, std::ostream &out,
+                       std::string const &format)
+{
+   pkgCache::PkgIterator const P = V.ParentPkg();
+   pkgDepCache * const DepCache = CacheFile.GetDepCache();
+   pkgDepCache::StateCache const &state = (*DepCache)[P];
 
+   std::string output;
    if (_config->FindB("APT::Cmd::use-format", false))
+      output = _config->Find("APT::Cmd::format", "${db::Status-Abbrev} ${Package} ${Version} ${Origin} ${Description}");
+   else
+      output = format;
+
+   // FIXME: some of these names are really icky – and all is nowhere documented
+   output = SubstVar(output, "${db::Status-Abbrev}", GetFlagsStr(CacheFile, P));
+   output = SubstVar(output, "${Package}", P.Name());
+   std::string const ArchStr = GetArchitecture(CacheFile, P);
+   output = SubstVar(output, "${Architecture}", ArchStr);
+   std::string const InstalledVerStr = GetInstalledVersion(CacheFile, P);
+   output = SubstVar(output, "${installed:Version}", InstalledVerStr);
+   std::string const CandidateVerStr = GetCandidateVersion(CacheFile, P);
+   output = SubstVar(output, "${candidate:Version}", CandidateVerStr);
+   std::string const VersionStr = GetVersion(CacheFile, V);
+   output = SubstVar(output, "${Version}", VersionStr);
+   output = SubstVar(output, "${Origin}", GetArchiveSuite(CacheFile, V));
+
+   std::string StatusStr = "";
+   if (P->CurrentVer != 0)
    {
-      std::string format = _config->Find("APT::Cmd::format", "${db::Status-Abbrev} ${Package} ${Version} ${Origin} ${Description}");
-      std::string output = format;
-   
-      output = SubstVar(output, "${db::Status-Abbrev}", GetFlagsStr(CacheFile, P));
-      output = SubstVar(output, "${Package}", name_str);
-      output = SubstVar(output, "${installed:Version}", GetInstalledVersion(CacheFile, P));
-      output = SubstVar(output, "${candidate:Version}", GetCandidateVersion(CacheFile, P));
-      output = SubstVar(output, "${Version}", GetVersion(CacheFile, V));
-      output = SubstVar(output, "${Description}", GetShortDescription(CacheFile, records, P));
-      output = SubstVar(output, "${Origin}", GetArchiveSuite(CacheFile, V));
-      out << output << std::endl;
-   } else {
-      // raring/linux-kernel version [upradable: new-version]
-      //    description
-      pkgPolicy *policy = CacheFile.GetPolicy();
-      std::string VersionStr = GetVersion(CacheFile, V);
-      std::string CandidateVerStr = GetCandidateVersion(CacheFile, P);
-      std::string InstalledVerStr = GetInstalledVersion(CacheFile, P);
-      std::string StatusStr;
-      if(P.CurrentVer() == V && state.Upgradable()) {
-         strprintf(StatusStr, _("[installed,upgradable to: %s]"),
-                   CandidateVerStr.c_str());
-      } else if (P.CurrentVer() == V) {
-         if(!V.Downloadable())
-            StatusStr = _("[installed,local]");
-         else
-            if(V.Automatic() && state.Garbage)
-               StatusStr = _("[installed,auto-removable]");
-            else if (state.Flags & pkgCache::Flag::Auto)
-               StatusStr = _("[installed,automatic]");
-            else
-               StatusStr = _("[installed]");
-      } else if (P.CurrentVer() && 
-                 policy->GetCandidateVer(P) == V && 
-                 state.Upgradable()) {
-            strprintf(StatusStr, _("[upgradable from: %s]"),
-                      InstalledVerStr.c_str());
-      } else {
-         if (V.ParentPkg()->CurrentState == pkgCache::State::ConfigFiles)
-            StatusStr = _("[residual-config]");
-         else
-            StatusStr = "";
-      }
-      out << std::setiosflags(std::ios::left)
-          << _config->Find("APT::Color::Highlight", "")
-          << name_str 
-          << _config->Find("APT::Color::Neutral", "")
-          << "/" << suite
-          << " "
-          << VersionStr << " " 
-          << GetArchitecture(CacheFile, P);
-      if (StatusStr != "") 
-         out << " " << StatusStr;
-      if (include_summary)
+      if (P.CurrentVer() == V)
       {
-         out << std::endl 
-             << "  " << GetShortDescription(CacheFile, records, P)
-             << std::endl;
+	 if (state.Upgradable() && state.CandidateVer != NULL)
+	    strprintf(StatusStr, _("[installed,upgradable to: %s]"),
+		  CandidateVerStr.c_str());
+	 else if (V.Downloadable() == false)
+	    StatusStr = _("[installed,local]");
+	 else if(V.Automatic() == true && state.Garbage == true)
+	    StatusStr = _("[installed,auto-removable]");
+	 else if ((state.Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto)
+	    StatusStr = _("[installed,automatic]");
+	 else
+	    StatusStr = _("[installed]");
       }
+      else if (state.CandidateVer == V && state.Upgradable())
+	 strprintf(StatusStr, _("[upgradable from: %s]"),
+	       InstalledVerStr.c_str());
    }
+   else if (V.ParentPkg()->CurrentState == pkgCache::State::ConfigFiles)
+      StatusStr = _("[residual-config]");
+   output = SubstVar(output, "${apt:Status}", StatusStr);
+   output = SubstVar(output, "${color:highlight}", _config->Find("APT::Color::Highlight", ""));
+   output = SubstVar(output, "${color:neutral}", _config->Find("APT::Color::Neutral", ""));
+   output = SubstVar(output, "${Description}", GetShortDescription(CacheFile, records, P));
+   output = SubstVar(output, "${LongDescription}", GetLongDescription(CacheFile, records, P));
+   output = SubstVar(output, "${ }${ }", "${ }");
+   output = SubstVar(output, "${ }\n", "\n");
+   output = SubstVar(output, "${ }", " ");
+   if (APT::String::Endswith(output, " ") == true)
+      output.erase(output.length() - 1);
+
+   out << output;
 }
 									/*}}}*/
 // ShowList - Show a list						/*{{{*/
@@ -344,129 +365,141 @@ bool ShowList(ostream &out,string Title,string List,string VersionsList)
            Depends: libldap2 (>= 2.0.2-2) but it is not going to be installed
            Depends: libsasl7 but it is not going to be installed   
  */
-void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
+static void ShowBrokenPackage(ostream &out, pkgCacheFile * const Cache, pkgCache::PkgIterator const &Pkg, bool const Now)
 {
-   if (Cache->BrokenCount() == 0)
+   if (Now == true)
+   {
+      if ((*Cache)[Pkg].NowBroken() == false)
+	 return;
+   }
+   else
+   {
+      if ((*Cache)[Pkg].InstBroken() == false)
+	 return;
+   }
+
+   // Print out each package and the failed dependencies
+   out << " " << Pkg.FullName(true) << " :";
+   unsigned const Indent = Pkg.FullName(true).size() + 3;
+   bool First = true;
+   pkgCache::VerIterator Ver;
+
+   if (Now == true)
+      Ver = Pkg.CurrentVer();
+   else
+      Ver = (*Cache)[Pkg].InstVerIter(*Cache);
+
+   if (Ver.end() == true)
+   {
+      out << endl;
       return;
+   }
 
-   out << _("The following packages have unmet dependencies:") << endl;
-   for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
+   for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false;)
    {
-      pkgCache::PkgIterator I(Cache,Cache.List[J]);
-      
+      // Compute a single dependency element (glob or)
+      pkgCache::DepIterator Start;
+      pkgCache::DepIterator End;
+      D.GlobOr(Start,End); // advances D
+
+      if ((*Cache)->IsImportantDep(End) == false)
+	 continue;
+
       if (Now == true)
       {
-	 if (Cache[I].NowBroken() == false)
+	 if (((*Cache)[End] & pkgDepCache::DepGNow) == pkgDepCache::DepGNow)
 	    continue;
       }
       else
       {
-	 if (Cache[I].InstBroken() == false)
+	 if (((*Cache)[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
 	    continue;
       }
-      
-      // Print out each package and the failed dependencies
-      out << " " << I.FullName(true) << " :";
-      unsigned const Indent = I.FullName(true).size() + 3;
-      bool First = true;
-      pkgCache::VerIterator Ver;
-      
-      if (Now == true)
-	 Ver = I.CurrentVer();
-      else
-	 Ver = Cache[I].InstVerIter(Cache);
-      
-      if (Ver.end() == true)
-      {
-	 out << endl;
-	 continue;
-      }
-      
-      for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false;)
+
+      bool FirstOr = true;
+      while (1)
       {
-	 // Compute a single dependency element (glob or)
-	 pkgCache::DepIterator Start;
-	 pkgCache::DepIterator End;
-	 D.GlobOr(Start,End); // advances D
+	 if (First == false)
+	    for (unsigned J = 0; J != Indent; J++)
+	       out << ' ';
+	 First = false;
 
-	 if (Cache->IsImportantDep(End) == false)
-	    continue;
-	 
-	 if (Now == true)
+	 if (FirstOr == false)
 	 {
-	    if ((Cache[End] & pkgDepCache::DepGNow) == pkgDepCache::DepGNow)
-	       continue;
+	    for (unsigned J = 0; J != strlen(End.DepType()) + 3; J++)
+	       out << ' ';
 	 }
 	 else
+	    out << ' ' << End.DepType() << ": ";
+	 FirstOr = false;
+
+	 out << Start.TargetPkg().FullName(true);
+
+	 // Show a quick summary of the version requirements
+	 if (Start.TargetVer() != 0)
+	    out << " (" << Start.CompType() << " " << Start.TargetVer() << ")";
+
+	 /* Show a summary of the target package if possible. In the case
+	    of virtual packages we show nothing */
+	 pkgCache::PkgIterator Targ = Start.TargetPkg();
+	 if (Targ->ProvidesList == 0)
 	 {
-	    if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
-	       continue;
-	 }
-	 
-	 bool FirstOr = true;
-	 while (1)
-	 {
-	    if (First == false)
-	       for (unsigned J = 0; J != Indent; J++)
-		  out << ' ';
-	    First = false;
+	    out << ' ';
+	    pkgCache::VerIterator Ver = (*Cache)[Targ].InstVerIter(*Cache);
+	    if (Now == true)
+	       Ver = Targ.CurrentVer();
 
-	    if (FirstOr == false)
+	    if (Ver.end() == false)
 	    {
-	       for (unsigned J = 0; J != strlen(End.DepType()) + 3; J++)
-		  out << ' ';
+	       if (Now == true)
+		  ioprintf(out,_("but %s is installed"),Ver.VerStr());
+	       else
+		  ioprintf(out,_("but %s is to be installed"),Ver.VerStr());
 	    }
 	    else
-	       out << ' ' << End.DepType() << ": ";
-	    FirstOr = false;
-	    
-	    out << Start.TargetPkg().FullName(true);
-	 
-	    // Show a quick summary of the version requirements
-	    if (Start.TargetVer() != 0)
-	       out << " (" << Start.CompType() << " " << Start.TargetVer() << ")";
-	    
-	    /* Show a summary of the target package if possible. In the case
-	       of virtual packages we show nothing */	 
-	    pkgCache::PkgIterator Targ = Start.TargetPkg();
-	    if (Targ->ProvidesList == 0)
 	    {
-	       out << ' ';
-	       pkgCache::VerIterator Ver = Cache[Targ].InstVerIter(Cache);
-	       if (Now == true)
-		  Ver = Targ.CurrentVer();
-	       	    
-	       if (Ver.end() == false)
+	       if ((*Cache)[Targ].CandidateVerIter(*Cache).end() == true)
 	       {
-		  if (Now == true)
-		     ioprintf(out,_("but %s is installed"),Ver.VerStr());
+		  if (Targ->ProvidesList == 0)
+		     out << _("but it is not installable");
 		  else
-		     ioprintf(out,_("but %s is to be installed"),Ver.VerStr());
-	       }	       
+		     out << _("but it is a virtual package");
+	       }
 	       else
-	       {
-		  if (Cache[Targ].CandidateVerIter(Cache).end() == true)
-		  {
-		     if (Targ->ProvidesList == 0)
-			out << _("but it is not installable");
-		     else
-			out << _("but it is a virtual package");
-		  }		  
-		  else
-		     out << (Now?_("but it is not installed"):_("but it is not going to be installed"));
-	       }	       
+		  out << (Now?_("but it is not installed"):_("but it is not going to be installed"));
 	    }
-	    
-	    if (Start != End)
-	       out << _(" or");
-	    out << endl;
-	    
-	    if (Start == End)
-	       break;
-	    ++Start;
-	 }	 
-      }	    
-   }   
+	 }
+
+	 if (Start != End)
+	    out << _(" or");
+	 out << endl;
+
+	 if (Start == End)
+	    break;
+	 ++Start;
+      }
+   }
+}
+void ShowBroken(ostream &out, CacheFile &Cache, bool const Now)
+{
+   if (Cache->BrokenCount() == 0)
+      return;
+
+   out << _("The following packages have unmet dependencies:") << endl;
+   for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
+   {
+      pkgCache::PkgIterator const I(Cache,Cache.List[J]);
+      ShowBrokenPackage(out, &Cache, I, Now);
+   }
+}
+void ShowBroken(ostream &out, pkgCacheFile &Cache, bool const Now)
+{
+   if (Cache->BrokenCount() == 0)
+      return;
+
+   out << _("The following packages have unmet dependencies:") << endl;
+   for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; ++Pkg)
+      ShowBrokenPackage(out, &Cache, Pkg, Now);
 }
 									/*}}}*/
 // ShowNew - Show packages to newly install				/*{{{*/
diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index 9633d0c37..e0dc9bf62 100644
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -23,12 +23,13 @@ APT_PUBLIC extern unsigned int ScreenWidth;
 APT_PUBLIC bool InitOutput();
 
 void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,
-                       pkgCache::VerIterator V, std::ostream &out,
-                       bool include_summary=true);
+                       pkgCache::VerIterator const &V, std::ostream &out,
+                       std::string const &format);
 
 
 // helper to describe global state
-APT_PUBLIC void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now);
+APT_PUBLIC void ShowBroken(std::ostream &out, CacheFile &Cache, bool const Now);
+APT_PUBLIC void ShowBroken(std::ostream &out, pkgCacheFile &Cache, bool const Now);
 
 APT_PUBLIC bool ShowList(std::ostream &out, std::string Title, std::string List,
               std::string VersionsList);
diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc
index ecd5d7fad..6bce9ffa4 100644
--- a/apt-private/private-search.cc
+++ b/apt-private/private-search.cc
@@ -32,61 +32,95 @@ bool FullTextSearch(CommandLine &CmdL)					/*{{{*/
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
    pkgDepCache::Policy *Plcy = CacheFile.GetPolicy();
-   pkgRecords records(CacheFile);
    if (unlikely(Cache == NULL || Plcy == NULL))
       return false;
 
-   const char **patterns;
-   patterns = CmdL.FileList + 1;
+   // Make sure there is at least one argument
+   unsigned int const NumPatterns = CmdL.FileSize() -1;
+   if (NumPatterns < 1)
+      return _error->Error(_("You must give at least one search pattern"));
+
+#define APT_FREE_PATTERNS() for (std::vector<regex_t>::iterator P = Patterns.begin(); \
+      P != Patterns.end(); ++P) { regfree(&(*P)); }
+
+   // Compile the regex pattern
+   std::vector<regex_t> Patterns;
+   for (unsigned int I = 0; I != NumPatterns; ++I)
+   {
+      regex_t pattern;
+      if (regcomp(&pattern, CmdL.FileList[I + 1], REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0)
+      {
+	 APT_FREE_PATTERNS();
+	 return _error->Error("Regex compilation error");
+      }
+      Patterns.push_back(pattern);
+   }
+
+   bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly", false);
 
    std::map<std::string, std::string> output_map;
-   std::map<std::string, std::string>::const_iterator K;
 
    LocalitySortedVersionSet bag;
    OpTextProgress progress(*_config);
    progress.OverallProgress(0, 100, 50,  _("Sorting"));
-   GetLocalitySortedVersionSet(CacheFile, bag, progress);
+   GetLocalitySortedVersionSet(CacheFile, &bag, &progress);
    LocalitySortedVersionSet::iterator V = bag.begin();
 
    progress.OverallProgress(50, 100, 50,  _("Full Text Search"));
    progress.SubProgress(bag.size());
+   pkgRecords records(CacheFile);
+
+   std::string format = "${color:highlight}${Package}${color:neutral}/${Origin} ${Version} ${Architecture}${ }${apt:Status}\n";
+   if (_config->FindB("APT::Cache::ShowFull",false) == false)
+      format += "  ${Description}\n";
+   else
+      format += "  ${LongDescription}\n";
+
    int Done = 0;
+   std::vector<bool> PkgsDone(Cache->Head().PackageCount, false);
    for ( ;V != bag.end(); ++V)
    {
       if (Done%500 == 0)
          progress.Progress(Done);
       ++Done;
-      
-      int i;
+
+      // we want to list each package only once
+      pkgCache::PkgIterator const P = V.ParentPkg();
+      if (PkgsDone[P->ID] == true)
+	 continue;
+
+      char const * const PkgName = P.Name();
       pkgCache::DescIterator Desc = V.TranslatedDescription();
       pkgRecords::Parser &parser = records.Lookup(Desc.FileList());
-     
+      std::string const LongDesc = parser.LongDesc();
+
       bool all_found = true;
-      for(i=0; patterns[i] != NULL; ++i)
+      for (std::vector<regex_t>::const_iterator pattern = Patterns.begin();
+	    pattern != Patterns.end(); ++pattern)
       {
-         // FIXME: use regexp instead of simple find()
-         const char *pattern = patterns[i];
-         all_found &=  (
-            strstr(V.ParentPkg().Name(), pattern) != NULL ||
-            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 (regexec(&(*pattern), PkgName, 0, 0, 0) == 0)
+	    continue;
+	 else if (NamesOnly == false && regexec(&(*pattern), LongDesc.c_str(), 0, 0, 0) == 0)
+	    continue;
+	 // search patterns are AND, so one failing fails all
+	 all_found = false;
+	 break;
       }
-      if (all_found)
+      if (all_found == true)
       {
-            std::stringstream outs;
-            ListSingleVersion(CacheFile, records, V, outs);
-            output_map.insert(std::make_pair<std::string, std::string>(
-                                 V.ParentPkg().Name(), outs.str()));
+	 PkgsDone[P->ID] = true;
+	 std::stringstream outs;
+	 ListSingleVersion(CacheFile, records, V, outs, format);
+	 output_map.insert(std::make_pair<std::string, std::string>(
+		  PkgName, outs.str()));
       }
    }
+   APT_FREE_PATTERNS();
    progress.Done();
 
    // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status)
    // output the sorted map
+   std::map<std::string, std::string>::const_iterator K;
    for (K = output_map.begin(); K != output_map.end(); ++K)
       std::cout << (*K).second << std::endl;
 
diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc
index fa827dea4..860d84b86 100644
--- a/apt-private/private-update.cc
+++ b/apt-private/private-update.cc
@@ -83,14 +83,17 @@ bool DoUpdate(CommandLine &CmdL)
       for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() != true; ++I)
       {
          pkgDepCache::StateCache &state = Cache[I];
-         if (I->CurrentVer != 0 && state.Upgradable())
+         if (I->CurrentVer != 0 && state.Upgradable() && state.CandidateVer != NULL)
             upgradable++;
       }
-      const char *msg = ngettext(
+      const char *msg = P_(
          "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n",
          "%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n",
          upgradable);
-      ioprintf(c1out, msg, upgradable);
+      if (upgradable == 0)
+         c1out << _("All packages are up to date.") << std::endl;
+      else
+         ioprintf(c1out, msg, upgradable);
    }
 
    return true;
diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
index 68b2c5e00..31f067576 100644
--- a/apt-private/private-upgrade.cc
+++ b/apt-private/private-upgrade.cc
@@ -23,18 +23,10 @@ static bool UpgradeHelper(CommandLine &CmdL, int UpgradeFlags)
       return false;
 
    c0out << _("Calculating upgrade... ") << std::flush;
-   if (APT::Upgrade::Upgrade(Cache, UpgradeFlags) == false)
-   {
-      c0out << _("Failed") << std::endl;
-      ShowBroken(c1out,Cache,false);
-      return _error->Error(_("Internal error, Upgrade broke stuff"));
-   }
+   if(!DoCacheManipulationFromCommandLine(CmdL, Cache, UpgradeFlags))
+      return false;
    c0out << _("Done") << std::endl;
 
-   // parse additional cmdline pkg manipulation switches
-   if(!DoCacheManipulationFromCommandLine(CmdL, Cache))
-      return false;
-   
    return InstallPackages(Cache,true);
 }
 
diff --git a/apt-private/private-utils.cc b/apt-private/private-utils.cc
index 9547a1b75..34af83c08 100644
--- a/apt-private/private-utils.cc
+++ b/apt-private/private-utils.cc
@@ -8,45 +8,69 @@
 #include <cstdlib>
 #include <unistd.h>
 
-// DisplayFileInPager - Display File with pager        			/*{{{*/
-void DisplayFileInPager(std::string filename)
+// DisplayFileInPager - Display File with pager				/*{{{*/
+void DisplayFileInPager(std::string const &filename)
 {
-   std::string pager = _config->Find("Dir::Bin::Pager", 
-                                        "/usr/bin/sensible-pager");
-
    pid_t Process = ExecFork();
    if (Process == 0)
    {
       const char *Args[3];
-      Args[0] = pager.c_str();
       Args[1] = filename.c_str();
-      Args[2] = 0;
+      Args[2] = NULL;
+      if (isatty(STDOUT_FILENO) == 1)
+      {
+	 // likely installed, provided by sensible-utils
+	 std::string const pager = _config->Find("Dir::Bin::Pager",
+	       "sensible-pager");
+	 Args[0] = pager.c_str();
+	 execvp(Args[0],(char **)Args);
+	 // lets try some obvious alternatives
+	 Args[0] = getenv("PAGER");
+	 if (Args[0] != NULL)
+	    execvp(Args[0],(char **)Args);
+
+	 Args[0] = "pager";
+	 execvp(Args[0],(char **)Args);
+      }
+      // we could read the file ourselves, but… meh
+      Args[0] = "cat";
       execvp(Args[0],(char **)Args);
       exit(100);
    }
-         
+
    // Wait for the subprocess
-   ExecWait(Process, "sensible-pager", false);
+   ExecWait(Process, "pager", false);
 }
 									/*}}}*/
-// EditFileInSensibleEditor - Edit File with editor    			/*{{{*/
-void EditFileInSensibleEditor(std::string filename)
+// EditFileInSensibleEditor - Edit File with editor			/*{{{*/
+void EditFileInSensibleEditor(std::string const &filename)
 {
-   std::string editor = _config->Find("Dir::Bin::Editor", 
-                                        "/usr/bin/sensible-editor");
-
    pid_t Process = ExecFork();
    if (Process == 0)
    {
+      // likely installed, provided by sensible-utils
+      std::string const editor = _config->Find("Dir::Bin::Editor",
+	    "sensible-editor");
       const char *Args[3];
       Args[0] = editor.c_str();
       Args[1] = filename.c_str();
-      Args[2] = 0;
+      Args[2] = NULL;
+      execvp(Args[0],(char **)Args);
+      // the usual suspects we can try as an alternative
+      Args[0] = getenv("VISUAL");
+      if (Args[0] != NULL)
+	 execvp(Args[0],(char **)Args);
+
+      Args[0] = getenv("EDITOR");
+      if (Args[0] != NULL)
+	 execvp(Args[0],(char **)Args);
+
+      Args[0] = "editor";
       execvp(Args[0],(char **)Args);
       exit(100);
    }
-         
+
    // Wait for the subprocess
-   ExecWait(Process, "sensible-editor", false);
+   ExecWait(Process, "editor", false);
 }
 									/*}}}*/
diff --git a/apt-private/private-utils.h b/apt-private/private-utils.h
index 432699787..8ba480bd4 100644
--- a/apt-private/private-utils.h
+++ b/apt-private/private-utils.h
@@ -5,7 +5,7 @@
 
 #include <string>
 
-APT_PUBLIC void DisplayFileInPager(std::string filename);
-APT_PUBLIC void EditFileInSensibleEditor(std::string filename);
+APT_PUBLIC void DisplayFileInPager(std::string const &filename);
+APT_PUBLIC void EditFileInSensibleEditor(std::string const &filename);
 
 #endif
diff --git a/buildlib/debiandoc.mak b/buildlib/debiandoc.mak
deleted file mode 100644
index 7e22467cf..000000000
--- a/buildlib/debiandoc.mak
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- make -*-
-
-# This processes debian-doc sgml to produce html and plain text output
-
-# Input
-# $(SOURCE) - The documents to use
-
-# All output is writtin to files in the build doc directory
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-LOCAL := debiandoc-$(firstword $(SOURCE))
-$(LOCAL)-HTML := $(addsuffix .html,$(addprefix $(DOC)/,$(basename $(SOURCE))))
-$(LOCAL)-TEXT := $(addsuffix .text,$(addprefix $(DOC)/,$(basename $(SOURCE))))
-
-debiandoc:
-
-#---------
-
-# Rules to build HTML documentations
-ifdef DEBIANDOC_HTML
-
-# Install generation hooks
-debiandoc: $($(LOCAL)-HTML)
-veryclean: veryclean/html/$(LOCAL)
-
-vpath %.sgml $(SUBDIRS)
-$(DOC)/%.html: %.sgml
-	echo Creating html for $< to $@
-	-rm -rf $@
-	(HERE=`pwd`; cd $(@D) && $(DEBIANDOC_HTML) $(DEBIANDOC_HTML_OPTIONS) $$HERE/$<) || exit 199
-
-# Clean rule
-.PHONY: veryclean/html/$(LOCAL)
-veryclean/html/$(LOCAL):
-	-rm -rf $($(@F)-HTML)
-	
-endif
-
-#---------
-
-# Rules to build Text documentations
-ifdef DEBIANDOC_TEXT
-
-# Install generation hooks
-debiandoc: $($(LOCAL)-TEXT)
-veryclean: veryclean/text/$(LOCAL)
-
-vpath %.sgml $(SUBDIRS)
-$(DOC)/%.text: %.sgml
-	echo Creating text for $< to $@
-	$(DEBIANDOC_TEXT) -O $< > $@ || exit 198
-
-# Clean rule
-.PHONY: veryclean/text/$(LOCAL)
-veryclean/text/$(LOCAL):
-	-rm -rf $($(@F)-TEXT)
-	
-endif
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 599b9ed85..c7931c504 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -76,7 +76,7 @@ PO_DOMAINS := $(BUILD)/po/domains
 
 # Module types
 LIBRARY_H = $(BASE)/buildlib/library.mak
-DEBIANDOC_H = $(BASE)/buildlib/debiandoc.mak
+DOCBOOK_H = $(BASE)/buildlib/docbook.mak
 MANPAGE_H = $(BASE)/buildlib/manpage.mak
 PROGRAM_H = $(BASE)/buildlib/program.mak
 PYTHON_H = $(BASE)/buildlib/python.mak
@@ -121,7 +121,7 @@ MKDIRS := $(BIN)
 all: dirs binary doc
 binary: library program
 maintainer-clean dist-clean distclean pristine sanity: veryclean
-startup headers library clean veryclean program test update-po manpages debiandoc:
+startup headers library clean veryclean program test update-po manpages docbook:
 
 veryclean:
 	echo Very Clean done for $(SUBDIR)
diff --git a/buildlib/docbook.mak b/buildlib/docbook.mak
new file mode 100644
index 000000000..6aa3ca0d2
--- /dev/null
+++ b/buildlib/docbook.mak
@@ -0,0 +1,75 @@
+# -*- make -*-
+
+# This processes DocBook XML to produce html and plain text output
+
+# Input
+# $(SOURCE) - The documents to use
+
+# All output is written to files in the build doc directory
+
+# See defaults.mak for information about LOCAL
+
+# Some local definitions
+LOCAL := docbook-$(firstword $(SOURCE))
+$(LOCAL)-HTML := $(addsuffix .html,$(addprefix $(DOC)/,$(basename $(SOURCE))))
+$(LOCAL)-TEXT := $(addsuffix .text,$(addprefix $(DOC)/,$(basename $(SOURCE))))
+INCLUDES = apt.ent apt-verbatim.ent apt-vendor.ent
+
+docbook:
+
+
+#---------
+
+# Rules to build HTML documentations
+ifdef XSLTPROC
+
+DOCBOOK_HTML_STYLESHEET := docbook-html-style.xsl
+
+# Install generation hooks
+docbook: $($(LOCAL)-HTML)
+veryclean: veryclean/html/$(LOCAL)
+
+vpath %.dbk $(SUBDIRS)
+vpath $(DOCBOOK_HTML_STYLESHEET) $(SUBDIRS)
+$(DOC)/%.html: %.dbk $(DOCBOOK_HTML_STYLESHEET) $(INCLUDES)
+	echo Creating html for $< to $@
+	-rm -rf $@
+	mkdir -p $@
+	$(DOCBOOK) \
+		--stringparam base.dir $@/ \
+		--stringparam l10n.gentext.default.language $(LC) \
+		$(<D)/$(DOCBOOK_HTML_STYLESHEET) $< || exit 199
+
+# Clean rule
+.PHONY: veryclean/html/$(LOCAL)
+veryclean/html/$(LOCAL):
+	-rm -rf $($(@F)-HTML)
+
+endif
+
+#---------
+
+# Rules to build Text documentations
+ifdef XSLTPROC
+
+DOCBOOK_TEXT_STYLESHEET := docbook-text-style.xsl
+
+# Install generation hooks
+docbook: $($(LOCAL)-TEXT)
+veryclean: veryclean/text/$(LOCAL)
+
+vpath %.dbk $(SUBDIRS)
+vpath $(DOCBOOK_TEXT_STYLESHEET) $(SUBDIRS)
+$(DOC)/%.text: %.dbk $(DOCBOOK_TEXT_STYLESHEET) $(INCLUDES)
+	echo Creating text for $< to $@
+	$(DOCBOOK) \
+		--stringparam l10n.gentext.default.language $(LC) \
+		$(<D)/$(DOCBOOK_TEXT_STYLESHEET) $< | \
+		LC_ALL=C.UTF-8 $(DOCBOOK2TEXT) > $@ || exit 198
+
+# Clean rule
+.PHONY: veryclean/text/$(LOCAL)
+veryclean/text/$(LOCAL):
+	-rm -rf $($(@F)-TEXT)
+
+endif
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index c1bf29672..b0a8d9d35 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -28,15 +28,17 @@ RANLIB:=@RANLIB@
 GCC3DEP = @GCC3DEP@
 INLINEDEPFLAG = -MD
 
-# Debian doc stuff
-DEBIANDOC_HTML = @DEBIANDOC_HTML@
-DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
-
 DOXYGEN = @DOXYGEN@
+W3M = @W3M@
 
-# xsltproc for the man pages
+# xsltproc for the man pages and documentation
 XSLTPROC := @XSLTPROC@
 
+# DocBook XML
+DOCBOOK = $(XSLTPROC) --nonet --novalid --xinclude
+DOCBOOK2TEXT = $(W3M) -o display_charset=UTF-8 -no-graph -T text/html \
+	-cols 78 -dump
+
 # po4a for the man pages
 PO4A := @PO4A@
 
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index b3d586b2f..0f53a8600 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -15,6 +15,9 @@ INCLUDES = apt.ent apt-verbatim.ent apt-vendor.ent
 
 manpages:
 
+%.xsl: ../%.xsl
+	cp -a $< .
+
 # Do not use XMLTO, build the manpages directly with XSLTPROC
 ifdef XSLTPROC
 
@@ -34,13 +37,11 @@ apt-verbatim.ent: ../apt-verbatim.ent
 apt-vendor.ent: ../apt-vendor.ent
 	cp -a ../apt-vendor.ent .
 
-manpage-style.xsl: ../manpage-style.xsl
-	sed "/<!-- LANGUAGE -->/ i\
-<xsl:param name=\"l10n.gentext.default.language\" select=\"'$(LC)'\" />" ../manpage-style.xsl > manpage-style.xsl
-
 $($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES)
 	echo Creating man page $@
-	$(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here???
+	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(LC) \
+		-o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here???
 	test -f $(subst .$(LC),,$@) || echo 'FIXME: xsltproc respects the -o flag now, workaround can be removed'
 	mv -f $(subst .$(LC),,$@) $@
 
@@ -69,7 +70,6 @@ ifneq ($(words $(SOURCE)),0)
 include $(MANPAGE_H)
 endif
 
-# Debian Doc SGML Documents
-SOURCE := $(wildcard *.$(LC).sgml)
-DEBIANDOC_HTML_OPTIONS=-l $(LC).UTF-8
-include $(DEBIANDOC_H)
+# DocBook XML Documents
+SOURCE := $(wildcard *.$(LC).dbk)
+include $(DOCBOOK_H)
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 1414617eb..ac0d48a36 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1278,8 +1278,8 @@ static bool Search(CommandLine &CmdL)
    ExDescFile *DFList = new ExDescFile[descCount];
    memset(DFList,0,sizeof(*DFList) * descCount);
 
-   bool PatternMatch[descCount * NumPatterns];
-   memset(PatternMatch,false,sizeof(PatternMatch));
+   bool *PatternMatch = new bool[descCount * NumPatterns];
+   memset(PatternMatch,false,sizeof(*PatternMatch) * descCount * NumPatterns);
 
    // Map versions that we want to write out onto the VerList array.
    for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G)
@@ -1389,6 +1389,7 @@ static bool Search(CommandLine &CmdL)
    }
    
    delete [] DFList;
+   delete [] PatternMatch;
    for (unsigned I = 0; I != NumPatterns; I++)
       regfree(&Patterns[I]);
    if (ferror(stdout))
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 05785ec54..0be33dc30 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -953,18 +953,19 @@ static bool DoSource(CommandLine &CmdL)
 	 else
 	 {
 	    // Call dpkg-source
-	    char S[500];
-	    snprintf(S,sizeof(S),"%s -x %s",
+	    std::string const sourceopts = _config->Find("DPkg::Source-Options", "-x");
+	    std::string S;
+	    strprintf(S, "%s %s %s",
 		     _config->Find("Dir::Bin::dpkg-source","dpkg-source").c_str(),
-		     Dsc[I].Dsc.c_str());
-	    if (system(S) != 0)
+		     sourceopts.c_str(), Dsc[I].Dsc.c_str());
+	    if (system(S.c_str()) != 0)
 	    {
-	       fprintf(stderr,_("Unpack command '%s' failed.\n"),S);
-	       fprintf(stderr,_("Check if the 'dpkg-dev' package is installed.\n"));
+	       fprintf(stderr, _("Unpack command '%s' failed.\n"), S.c_str());
+	       fprintf(stderr, _("Check if the 'dpkg-dev' package is installed.\n"));
 	       _exit(1);
-	    }	    
+	    }
 	 }
-	 
+
 	 // Try to compile it with dpkg-buildpackage
 	 if (_config->FindB("APT::Get::Compile",false) == true)
 	 {
@@ -980,20 +981,20 @@ static bool DoSource(CommandLine &CmdL)
 	    buildopts.append(_config->Find("DPkg::Build-Options","-b -uc"));
 
 	    // Call dpkg-buildpackage
-	    char S[500];
-	    snprintf(S,sizeof(S),"cd %s && %s %s",
+	    std::string S;
+	    strprintf(S, "cd %s && %s %s",
 		     Dir.c_str(),
 		     _config->Find("Dir::Bin::dpkg-buildpackage","dpkg-buildpackage").c_str(),
 		     buildopts.c_str());
-	    
-	    if (system(S) != 0)
+
+	    if (system(S.c_str()) != 0)
 	    {
-	       fprintf(stderr,_("Build command '%s' failed.\n"),S);
+	       fprintf(stderr, _("Build command '%s' failed.\n"), S.c_str());
 	       _exit(1);
-	    }	    
-	 }      
+	    }
+	 }
       }
-      
+
       _exit(0);
    }
 
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index b0edafcbd..dd43ea1bc 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -16,6 +16,7 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
+#include <apt-pkg/proxy.h>
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-output.h>
@@ -29,6 +30,19 @@
 #include <apti18n.h>
 									/*}}}*/
 
+static bool DoAutoDetectProxy(CommandLine &CmdL)
+{
+   if (CmdL.FileSize() != 2)
+      return _error->Error(_("Need one URL as argument"));
+   URI ServerURL(CmdL.FileList[1]);
+   AutoDetectProxy(ServerURL);
+   std::string SpecificProxy = _config->Find("Acquire::"+ServerURL.Access+"::Proxy::" + ServerURL.Host);
+   ioprintf(std::cout, "Using proxy '%s' for URL '%s'\n",
+            SpecificProxy.c_str(), std::string(ServerURL).c_str());
+
+   return true;
+}
+
 static bool DoDownloadFile(CommandLine &CmdL)
 {
    if (CmdL.FileSize() <= 2)
@@ -70,6 +84,7 @@ static bool ShowHelp(CommandLine &)
       "\n"
       "Commands:\n"
       "   download-file - download the given uri to the target-path\n"
+      "   auto-detect-proxy - detect proxy using apt.conf\n"
       "\n"
       "                       This APT helper has Super Meep Powers.\n");
    return true;
@@ -80,6 +95,7 @@ int main(int argc,const char *argv[])					/*{{{*/
 {
    CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
 				   {"download-file", &DoDownloadFile},
+				   {"auto-detect-proxy", &DoAutoDetectProxy},
                                    {0,0}};
 
    std::vector<CommandLine::Args> Args = getCommandArgs(
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index e4cdf6381..5fda7b6a0 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -24,9 +24,11 @@
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
+#include <apt-private/private-output.h>
 
 #include <string.h>
 #include <iostream>
+#include <sstream>
 #include <list>
 #include <string>
 #include <unistd.h>
@@ -168,18 +170,20 @@ int main(int argc,const char *argv[])					/*{{{*/
 
 	EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
 
+	std::string failure;
 	if (upgrade == true) {
-		if (pkgAllUpgrade(CacheFile) == false) {
-			EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occurred", output);
-			return 0;
-		}
+		if (pkgAllUpgrade(CacheFile) == false)
+			failure = "ERR_UNSOLVABLE_UPGRADE";
 	} else if (distUpgrade == true) {
-		if (pkgDistUpgrade(CacheFile) == false) {
-			EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occurred", output);
-			return 0;
-		}
-	} else if (Fix.Resolve() == false) {
-		EDSP::WriteError("ERR_UNSOLVABLE", "An error occurred", output);
+		if (pkgDistUpgrade(CacheFile) == false)
+			failure = "ERR_UNSOLVABLE_DIST_UPGRADE";
+	} else if (Fix.Resolve() == false)
+		failure = "ERR_UNSOLVABLE";
+
+	if (failure.empty() == false) {
+		std::ostringstream broken;
+		ShowBroken(broken, CacheFile, false);
+		EDSP::WriteError(failure.c_str(), broken.str(), output);
 		return 0;
 	}
 
diff --git a/cmdline/makefile b/cmdline/makefile
index c4a249cd6..b7c35ddd1 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -8,49 +8,49 @@ include ../buildlib/defaults.mak
 # The apt program
 PROGRAM=apt
 SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
+LIB_MAKES = apt-pkg/makefile apt-private/makefile
 SOURCE = apt.cc
 include $(PROGRAM_H)
 
 # The apt-cache program
 PROGRAM=apt-cache
 SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
+LIB_MAKES = apt-pkg/makefile apt-private/makefile
 SOURCE = apt-cache.cc
 include $(PROGRAM_H)
 
 # The apt-get program
 PROGRAM=apt-get
 SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
+LIB_MAKES = apt-pkg/makefile apt-private/makefile
 SOURCE = apt-get.cc 
 include $(PROGRAM_H)
 
 # The apt-config program
 PROGRAM=apt-config
 SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
+LIB_MAKES = apt-pkg/makefile apt-private/makefile
 SOURCE = apt-config.cc
 include $(PROGRAM_H)
 
 # The apt-cdrom program
 PROGRAM=apt-cdrom
 SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
+LIB_MAKES = apt-pkg/makefile apt-private/makefile
 SOURCE = apt-cdrom.cc 
 include $(PROGRAM_H)
 
 # The apt-mark program
 PROGRAM=apt-mark
 SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
+LIB_MAKES = apt-pkg/makefile apt-private/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
+LIB_MAKES = apt-pkg/makefile apt-private/makefile
 SOURCE = apt-helper.cc
 include $(PROGRAM_H)
 
@@ -75,14 +75,14 @@ include $(PROGRAM_H)
 # The apt-extracttemplates program
 PROGRAM=apt-extracttemplates
 SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
+LIB_MAKES = apt-pkg/makefile apt-inst/makefile
 SOURCE = apt-extracttemplates.cc 
 include $(PROGRAM_H)
 
 # The internal solver acting as an external
 PROGRAM=apt-internal-solver
-SLIBS = -lapt-pkg $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
+SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile apt-private/makefile
 SOURCE = apt-internal-solver.cc
 include $(PROGRAM_H)
 
diff --git a/configure.ac b/configure.ac
index 95ebc01b2..0e9295171 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,10 @@ dnl code more portable
 
 dnl You MUST have an environment that has all the POSIX functions and
 dnl some of the more popular bsd/sysv ones (like select). You'll also
-dnl need a C++ compiler that is semi-standard conformant, exceptions are 
+dnl need a C++ compiler that is semi-standard conformant, exceptions are
 dnl not used but STL is.
 
-dnl 'make -f Makefile startup' will generate the configure file from 
+dnl 'make -f Makefile startup' will generate the configure file from
 dnl configure.ac correctly and can be run at any time
 
 AC_PREREQ(2.50)
@@ -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="1.0.4ubuntu2"
+PACKAGE_VERSION="1.0.8ubuntu1"
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
@@ -53,7 +53,7 @@ AC_SEARCH_LIBS(connect,socket)
 SOCKETLIBS="$LIBS"
 AC_SUBST(SOCKETLIBS)
 LIBS="$SAVE_LIBS"
- 
+
 dnl Checks for pthread -- disabled due to glibc bugs jgg
 dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
 AC_SUBST(PTHREADLIB)
@@ -89,6 +89,13 @@ AC_CHECK_LIB(curl, curl_easy_init,
      AC_MSG_ERROR([failed: I need CURL due https support]),
 )
 
+AC_LANG_PUSH([C++])
+AC_CHECK_HEADER(gtest/gtest.h,,
+     AC_MSG_ERROR([failed: I need gtest to build tests]),
+)
+AC_LANG_POP([C++])
+
+
 AC_SUBST(BDBLIB)
 
 HAVE_ZLIB=no
@@ -160,20 +167,17 @@ dnl HP-UX needs -d_XOPEN_SOURCE_EXTENDED for h_errno
 AC_MSG_CHECKING(for h_errno)
 AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)],
    [CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
-    AC_EGREP_HEADER(h_errno, netdb.h, 
+    AC_EGREP_HEADER(h_errno, netdb.h,
        [AC_MSG_RESULT(needs _XOPEN_SOURCE_EXTENDED)],
        [AC_MSG_ERROR("not found.")])
    ])
 
-dnl Check for debiandoc
-AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html)
-AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text)
-
 dnl Check for doxygen
 AC_PATH_PROG(DOXYGEN, doxygen)
 
 dnl Check for the XSLTProc tool needed to build man pages together with po4a
 AC_PATH_PROG(XSLTPROC,xsltproc)
+AC_PATH_PROG(W3M, w3m)
 
 dnl Check for the po4a tool needed to build man pages
 AC_PATH_PROG(PO4A,po4a)
diff --git a/debian/changelog b/debian/changelog
index ed8f68e43..b48a50f30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,37 +1,163 @@
-apt (1.0.4ubuntu4) utopic; urgency=medium
+apt (1.0.8ubuntu1) UNRELEASED; urgency=low
 
-  * test/integration/test-essential-force-loopbreak: 
-    - fix test on non-amd64 systems
+  * merged fixes from debian/sid
 
- -- Michael Vogt <mvo@ubuntu.com>  Thu, 12 Jun 2014 10:56:09 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 10 Sep 2014 08:12:38 +0200
 
-apt (1.0.4ubuntu3) utopic; urgency=medium
+apt (1.0.8) unstable; urgency=medium
 
-  * ensure that test-apt-ftparchive-cachedb-lp1274466, 
-    test-external-dependency-solver-protocol run in the ADT
-    environment
+  [ Holger Wansing ]
+  * German program translation update (Closes: 758837)
 
- -- Michael Vogt <mvo@ubuntu.com>  Thu, 12 Jun 2014 08:47:29 +0200
+  [ Américo Monteiro ]
+  * Portuguese manpages translation update (Closes: 759608)
 
-apt (1.0.4ubuntu2) utopic; urgency=medium
+  [ Warren He ]
+  * initialize iPolicyBrokenCount in DepCache::Update (Closes: 758397)
 
-  * debian/test/control:
-    - add missing db-util to test dependencies
-  * debian/tests/run-tests:
-    - fix path for apt-internal-solver
+  [ Andreas Oberritter ]
+  * Avoid yielding blank lines with APT::Cmd::use-format=true
 
- -- Michael Vogt <mvo@ubuntu.com>  Wed, 11 Jun 2014 14:51:31 +0200
+  [ Michael Vogt ]
+  * Make Proxy-Auto-Detect check for each host (Closes: #759264)
+  * Add testcase for apt list --all-versions
+  * * apt-pkg/deb/dpkgpm.cc:
+    - update string matching for dpkg I/O errors. (LP: #1363257)
+    - properly parse the dpkg status line so that package name 
+      is properly set and an apport report is created. Thanks 
+      to Anders Kaseorg for the patch  (LP: #1353171)
+  * Use heap to allocate PatternMatch to avoid potential stack overflow
+    (Closes: 759612)
+  * Run autopkgtest tests with "env -i" to avoid pollution from the host env
+    (Closes: #759655)
+  * test/integration/test-ubuntu-bug-346386-apt-get-update-paywall: 
+    - use downloadfile() to fix test failure
+  * Fix incorrect upgradable listing in "apt list" 
+    (thanks to Michael Musenbrock) (Closes: #753297)
+  * apt-pkg/cachefile.cc:
+    - ensure we have a Policy in CacheFile.BuildDepCache()
+  * methods/http.cc:
+    - Improve Debug::Acquire::http debug output
 
-apt (1.0.4ubuntu1) utopic; urgency=low
+  [ Dimitri John Ledkov ]
+  * apt-ftparchive: make Packages & Sources generation optional, 
+    during Generate call
 
-  * Merged from debian/sid, remaining changes:
-    - patch for apt cross-building, see http://bugs.debian.org/666772
-    - ubuntu changelog download handling
-    - apt-key net-update/apt-xapian-index
-    - git-buildpackage config adjustments
-    - ubuntu keyring
+  [ David Kalnischkies ]
+  * support regular expressions in 'apt search'
+  * implement --full in apt search
+  * fix progress report for upgrade and reinstall
+  * rework PTY magic to fix stair-stepping on kfreebsd (Closes: 759684)
+  * don't call pager in non-terminals for changelog (Closes: 755040)
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jun 2014 19:00:00 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 09 Sep 2014 20:09:11 +0200
+
+apt (1.0.7) unstable; urgency=medium
+
+  [ Michael Vogt ]
+  * add REAMDE.md
+  * StringToBool: only act if the entire string is consumed by strtol()
+  * Use @builddeps@ in the debian/tests/control file
+  * apt-pkg/acquire-item.cc: make pkgAcqDiffIndex more uniform
+  * Fix SmartConfigure to ignore ordering of packages that are already valid
+  * doc/apt.8.xml: fix typo, thanks to Jakub Wilk (Closes: #756056)
+  * doc/po/pt.po: updated, thanks to Américo Monteir (Closes: #756200)
+
+  [ victory ]
+  * Update Japanese documentation translation (Closes: #754817)
+
+  [ Trần Ng�c Quân ]
+  * l10n: vi.po (636t): Update one new string
+
+  [ Julian Andres Klode ]
+  * Fix debListParser to accept "no" as a value for the Multi-Arch field
+    (Closes: #759099)
+
+  [ Mert Dirik ]
+  * Turkish program translation update (Closes: 756710)
+
+  [ Miroslav Kure ]
+  * Czech program translation update (Closes: 758208)
+
+  [ David Kalnischkies ]
+  * add dpkg::source-options for dpkg-source invocation (Closes: 757534)
+  * support versioned provides as implemented by dpkg (Closes: 758153)
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 27 Aug 2014 17:11:42 -0700
+
+apt (1.0.6) unstable; urgency=medium
+
+  [ Chris Leick ]
+  * German translation reviewed by Erik Pfannenstein
+
+  [ Michael Vogt ]
+  * methods/http.cc: use Req.str() in debug output
+  * Do not try to parse invalid translation files (LP: #756317)
+  * Do not clean "/" in pkgAcquire::Clean/pkgArchiveCleaner (Closes: #753531)
+  * Only show packages as upgradable if the have a CandidateVer != 0
+    (Closes: #753297)
+
+  [ Trần Ng�c Quân ]
+  * l10n: vi.po: Update 3 new messages
+
+  [ Joe Hansen ]
+  * Danish program translation update (Closes: 753979)
+
+  [ David Kalnischkies ]
+  * handle moved mmap after UniqFindTagWrite call (Closes: #753941)
+
+  [ Michele Orrù ]
+  * use printf instead of echo in testing framework
+
+  [ Cédric Barboiron ]
+  * Improve description how to turn off the caches (Closes: #753531)
+
+  [ Guillem Jover ]
+  * po: Fill or add missing Language field
+  * po: Remove fuzzy from file msgid header
+  * po: Fill Project-Id-Version with correct project id and version
+  * po: Fix Plural-Forms fields
+  * po: Fix or add missing email addresses
+  * po: Fix encoding issues
+  * po: Fix format specifier order in translation
+  * build: Set the XSL parameter through the command line instead of sed
+  * build: Convert from DebianDoc SGML to DocBook XML
+  * doc: Convert from DebianDoc SGML to DocBook XML
+  * doc: Unfuzzy DocBook translations
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 10 Jul 2014 11:46:07 +0200
+
+apt (1.0.5) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * fix autopkgtest tests
+  * fix test-apt-ftparchive-cachedb-lp1274466 and apt-internal-solver tests
+  * test/integration/test-essential-force-loopbreak: fix on non-amd64 systems
+  * Tell the user if no updates are available after apt update (Closes: #751388)
+
+  [ Michele Orrù ]
+  * Check for gtest's header before building.
+
+  [ Chris Leick ]
+  * Updated translation of german documentation
+
+  [ Konstantin Manna ]
+  * fix two german manpage spelling mistakes (Closes: 751635)
+  * add missing comma in SEE ALSO of apt-secure manpage (Closes: 748506)
+
+  [ Fredrik Fornwall ]
+  * use P_ instead of ngettext to compiling with --disable-nls (Closes: 751857)
+
+  [ David Kalnischkies ]
+  * don't send pkg from an unknown architecture via EDSP
+  * fix SubstVar to be usable as a replace_all method
+  * show our broken packages message in 'apt' solver
+  * do not call resolver twice on (dist-)upgrade
+
+  [ Stefano Zacchiroli ]
+  * EDSP doc: clarify that Install/Remove packages are arch-qualified
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 18 Jun 2014 13:35:13 +0200
 
 apt (1.0.4) unstable; urgency=low
 
@@ -74,6 +200,41 @@ apt (1.0.4) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Tue, 10 Jun 2014 14:55:05 +0200
 
+apt (1.0.4ubuntu4) utopic; urgency=medium
+
+  * test/integration/test-essential-force-loopbreak: 
+    - fix test on non-amd64 systems
+
+ -- Michael Vogt <mvo@ubuntu.com>  Thu, 12 Jun 2014 10:56:09 +0200
+
+apt (1.0.4ubuntu3) utopic; urgency=medium
+
+  * ensure that test-apt-ftparchive-cachedb-lp1274466, 
+    test-external-dependency-solver-protocol run in the ADT
+    environment
+
+ -- Michael Vogt <mvo@ubuntu.com>  Thu, 12 Jun 2014 08:47:29 +0200
+
+apt (1.0.4ubuntu2) utopic; urgency=medium
+
+  * debian/test/control:
+    - add missing db-util to test dependencies
+  * debian/tests/run-tests:
+    - fix path for apt-internal-solver
+
+ -- Michael Vogt <mvo@ubuntu.com>  Wed, 11 Jun 2014 14:51:31 +0200
+
+apt (1.0.4ubuntu1) utopic; urgency=low
+
+  * Merged from debian/sid, remaining changes:
+    - patch for apt cross-building, see http://bugs.debian.org/666772
+    - ubuntu changelog download handling
+    - apt-key net-update/apt-xapian-index
+    - git-buildpackage config adjustments
+    - ubuntu keyring
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jun 2014 19:00:00 +0200
+
 apt (1.0.3) unstable; urgency=medium
 
   [ Michael Vogt ]
diff --git a/debian/control b/debian/control
index d0e89825c..299092543 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
  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-Depends-Indep: doxygen, w3m, graphviz
 Build-Conflicts: autoconf2.13, automake1.4
 Vcs-Git: git://anonscm.debian.org/apt/apt.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 0b205c1fd..d702799ac 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,3 +3,5 @@ prebuild = ./prepare-release pre-export
 postbuild = ./prepare-release post-build
 debian-branch = ubuntu/master
 debian-tag = %(version)s
+export-dir = ../build-area
+sign-tags = True
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index d89a36cde..085224b15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR)
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 
 build-binary: build/build-binary-stamp
-build-debiandoc: build/build-debiandoc-stamp
+build-docbook: build/build-docbook-stamp
 build-manpages: build/build-manpages-stamp
 
 # Note that this is unconditionally done first as part of loading environment.mak
@@ -101,9 +101,9 @@ else
 endif
 	touch $@
 
-build/build-debiandoc-stamp: build/configure-stamp
+build/build-docbook-stamp: build/configure-stamp
 	# Add here commands to compile the package.
-	$(MAKE) debiandoc
+	$(MAKE) docbook
 	touch $@
 
 build/build-manpages-stamp: build/configure-stamp
@@ -126,7 +126,7 @@ debian/%.install: debian/%.install.in
 	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
 
 # Build architecture-independent files here.
-libapt-pkg-doc: build-debiandoc
+libapt-pkg-doc: build-docbook
 	dh_testdir -p$@
 	dh_testroot -p$@
 	dh_prep -p$@
@@ -153,7 +153,7 @@ libapt-pkg-doc: build-debiandoc
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
-apt-doc: build-debiandoc
+apt-doc: build-docbook
 	dh_testdir -p$@
 	dh_testroot -p$@
 	dh_prep -p$@
@@ -353,7 +353,7 @@ binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-trans
 binary-indep: apt-doc libapt-pkg-doc
 binary: binary-indep binary-arch
 build-arch: build-binary
-build-indep: build-manpages build-debiandoc
+build-indep: build-manpages build-docbook
 build: build-indep build-arch
 
 .PHONY: build clean binary-indep binary-arch binary
diff --git a/debian/tests/control b/debian/tests/control
index 72e9deef7..f7e47c5f3 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: run-tests
 Restrictions: allow-stderr 
-Depends: @, build-essential, fakeroot, wget, 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, libdb-dev, db-util
+Depends: @, @builddeps@, fakeroot, wget, stunnel4, db-util
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 308031e9d..9d7c484fc 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -8,7 +8,9 @@ if [ ! -e environment.mak ]; then
 fi
 make -C test/interactive-helper/
 
-# run against the installed apt
+# run tests against the installed apt, use "env -i" to ensure
+# the host env does not pollute our environment
+env -i \
 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/ \
diff --git a/doc/Bugs b/doc/Bugs
deleted file mode 100644
index d584dce49..000000000
--- a/doc/Bugs
+++ /dev/null
@@ -1,174 +0,0 @@
--- Real Problems
-#24000: Bug in apt Version: 0.0.17-1bo0
- Summary: Couldn't locate an archive source for a package
- Status: Require Status file. 
-#24717: apt dies early if one postinst/preinst dies
- Status: Requires dpkg modifications
-#25104: APT should retry failed downloads
- Summary: FTP method has problems with busy servers
- Status: The 0.3.0 ftp method should probably use the configuration mechanism
-         to control this desired behavoir.
-#25176: Problem with FTP/firewall
-#25458: Problem with FTP/firewall
- Summary: FTP method has no controls for firewalls
- Status: The 0.3.0 ftp method should probably use the configuration mechanism
-         to control this desired behavoir.
- 
--- Fixed but unclosed things
-#25026: apt: Why do you list the packages you're _not_ doing anything to instead of the ones you are?
-#22507: apt: apt-get - listing packages to be upgraded (wishlist)
- Summary: Feature request 
- Status: Fixed in 0.3.0 via the -u option
-#21113: [Apt] In dselect, update dies and exits if the packages file is not found.
- Status: Fixed in 0.3.0
-#22675: APT does not honor the --admin-dir option
-#22836: Disk/Zip-Method for apt?
- Summary: APT does not provide a way to download packages onto a 
-          removable media for another computer
- Status: 0.3.0 has substantially better support for this to the point
-         that it is doable by using a separate configuration file and
-	 the -c option
-#27601: srange errors from dselect
- Summary: Couldn't locate an archive source
- Status: Require status file
-         Believed to be fixed in 0.1.9, was not reproducible w/ given
-	 status file
-#27841: apt: apt depends on a missing library
- Status: New versions of APT in slink have been compiled with libstdc++2.9
-#23984: apt: support for "no_proxy" would be nice
- Status: Planned to be integrated into the new methods via the configuration
-         file
-	 Done - Use Acquire::http::proxy::host.com="DIRECT"
-#25021: apt: Need some control over multiple connections
- Status: Probable that 0.3.x will have support for configuing some
-         parameters
-	 Done - Use Acquire::Queue-Mode="access"
-#25019: apt: Confusing progress report
- Summary: Gripes about the progress meter
- Status: I do not intend to implement very many of these ideas in apt-get. 
-         The GUI will naturally be better
-	 I think the new progress meter address basically everyone's 
-	 concerns.
-#25022: apt: Lack of feedback on date checking
- Summary: Wants to know what package files were not updated
- Status: There is no place for this in the current apt-get design,
-         probably won't make the GUI either.
-	 Wee, the new acquire code allows this, it now prints out 'Hit'
-#26019: apt may report wrong line speed
-#26433: apt: claims to fetch things it doesn't actually fetch (wishlist)
-#28778: apt: apt's fetched message is wrong for update of packages files
- Summary: APT includes the fetch time from the local cache in its
-          calculations
- Status: Probably will be fixed with new acquire code
-         And it actually was fixed with the new acquire code
-#26670: apt: apt-get dumps core after checking integrity
- Summary: Some terminal environments cause APT to crash
-          Win95 telnet and emacs term-in-a-buffer are two at least
- Status: I have no idea why.
-         Seems to be gone in .3, whatever it was...
-#25001: apt: cleaned out archive even though not all files were installed
- Status: Apparently in some cases APT can return a success code even 
-         though it failed. I'm paying very close attention to this in
-	 0.3.x. Not to mention that the clean behavior will be 
-	 configurable..
-#28391: apt-get install without upgrading
- Summary: Make install leave the package in the keep state if it is already
-          installed
- Status: Will be implemented in 0.3.0
-	 Try the --no-upgrade options
-#28373: apt package is missing information on ftp.conf
-#29293: apt: Docs reference apt(8) but apt(8) not provided.
- Summary: The man pages have references to several non-existent items,
-          ftp.conf is only one of them.
- Status: Fix the man pages. This certainly will be done in 0.3.0
-#24799: Some suggestions for the apt method in dselect
- Summary: Wants to be able to specifiy -d from dselect
- Status: Likely a APT_OPTIONS environment variable will be created, -d can
-         be put there.
-	 There is already an APT_CONFIG in 0.3, APT_OPTIONS may also 
-	 appear..
-	 Use Dselect::Options "-d" and others
-#29920: Wish for more verbosity on "has no installation candidate"
- Summary: More reports
- Status: Already fixed in .3
-#29382: apt: apt deletes packages after installation without any question
- Summary: Obvois.
- Status: Fixed in .3, use Dselect::Clean "prompt"
-#30027: apt: version comparison bug
- Summary: Version compare differs from dpkg
- Status: Fixed in all CVS versions.
-#30260: apt: wishlist: do not return to main menu without prompting for return
- Summary: Wants to prompt after dselect update
- Status: Fixed in v3, use dselect::promptafterupdate "true";
-#29441: documenting the codes for -s
- Summary: Apparently the simulation output is not immediately obvois
- Status: Someone should update the man page.
-#24685: HTTP Proxy cache refresh
- Summary: Some caches hold onto the package index file for too long
- Status: It may be possible to insert the proper header to disable
-         caching but I can't think how to do this while allowing
-	 the cache to return cached objects - in effect it would
-	 completely disable the cache which may not be desired.
-         APT now sends a max age header. See the apt.conf(5)
-#28172: HTTP Proxy cache refresh should be forced for corrupted packages
- Summary: Some problem resulted in a corrupted package
- Status: I believe this reflects a deeper problem and the suggested solution
-         is only a band-aide patch. I intend to close this bug when #24685
-	 is fixed with a configuration directive.
-	 Use -o acquire::http::no-cache=true
-#29351: poor error message after conffile update
- Summary: APT errors when the package file is not found
- Status: The new APT warns better and the error is not fatal
-#30112: apt: internal error in apt
- Summary: APT gives an unclear error when it cannot correct dependencies
- Status: Error is clearer
-#30324: apt-get lying about file dates in /var/state/apt/lists
- Summary: Doesn't copy the file dates right with file URIs
- Status: Fixed in v3
-#30383: apt: dist-upgrade msg "E: Internal error, ScoredFix generated breaks."
- Summary: libc6 maddness causes bizzar problems
- Status: Fixed in v3 
-#29983: apt: Wrong diagnostic, could be better
- Summary: It doesn't explicy say you should be root
- Status: Fixed in v3
-#22892: Apt improvements
- Summary: Bails if an index file can't be found
- Status: Fixed in v3
-#28184: apt could be smarter regarding mirrors
- Summary: Make use of redundant sources
- Status: 0.3.0 will likely do this, already the information for it is stored.
-#27646: Apt: dpkg --merge-avail
- Summary: Suggestion to call merge avail after each update operation
- Status: Unlikely. The dpkg --print-avail functions should be obsoleted
-         by the apt-query program which should be written.
-         Use the dselect script, alias or something.
-#26663: rsync file access
- Status: Unlikely, rsync does not provide the necessary support to be
-         a terribly good method. I do not intend any 'split mode' 
-	 support (ie a way to get Package files via rsync and .debs
-	 via http) 
-#27100: apt: Better support for project/experimental
- Status: GUI Feature - Version selection and pinning
-         Honors the NotAutomatic flag
-#30643: base: apt-get update problems with http-/ftp-caches (i.e. squid)
- Status: Fixed as best I can. Try the Acquire::http::No-Cache option.
-
--- Silly things
-#26592: apt: Problems with ftpd in SunOS 5.6
-#29903: apt-get insists onto sending a SIZE command
- Summary: SunOS ftpd does not support the SIZE command
- Status: Probably not worth fixing
-#20723: Apt suggestion
- Summary: Package Grouping Mechanism
- Status: Who knows
-#22550: apt-get upgrade could configure packages earlier
- Status: Who knows
-#23934: apt-get source <package>
-#27190: apt: installing source packages (wishlist)
- Status: Impossible to do without an index file for all source archives.
-#22551: apt: wish: use dist X iff pkg does not exist in dist Y
- Status: GUI Feature - Version selection and pinning
-#30237: apt: 0.1.9 checks dependencies against packages.gz
- Summary: For packages with identical version numbers APT prefers
-          to use the archive index files
- Status: Yes it is sorta bad, but there is no reasonable solution.
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index a53a64446..a9f6c8da2 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index 2fcd8e494..23b26adaf 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml
index b84d25f7a..f35f2488c 100644
--- a/doc/apt-config.8.xml
+++ b/doc/apt-config.8.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index 9f9888069..4a1f7213a 100644
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 6482b4632..92016298d 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index a3bfc331c..80b3be639 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 5dbbaaf26..1d91790ea 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index d00e5b9e2..94f24437e 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 981351615..e343b86ea 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
@@ -193,7 +187,7 @@
 <refsect1><title>See Also</title> 
 <para> 
 &apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,
-&debsign; &debsig-verify;, &gpg;
+&debsign;, &debsig-verify;, &gpg;
 </para>
 
 <para>For more background information you might want to review the
diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml
index 9bb03d624..c1f327fe8 100644
--- a/doc/apt-sortpkgs.1.xml
+++ b/doc/apt-sortpkgs.1.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 496c4c324..c176e426d 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -225,7 +225,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.0.4ubuntu2">
+<!ENTITY apt-product-version "1.0.8">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index bcad5ee7f..29bf96751 100644
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -1,13 +1,9 @@
 <?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;
-
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
@@ -105,8 +101,8 @@
      <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.
+     <filename>/etc/apt/sources.list</filename>. New packages will be
+     installed, but existing packages will never be removed.
      </para></listitem>
      </varlistentry>
 
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index fcbf20dac..df6c77ff0 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
@@ -608,10 +602,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    information, such as the two package caches <literal>srcpkgcache</literal> and 
    <literal>pkgcache</literal> as well as the location to place downloaded archives, 
    <literal>Dir::Cache::archives</literal>. Generation of caches can be turned off
-   by setting their names to the empty string. This will slow down startup but
-   save disk space. It is probably preferable to turn off the pkgcache rather
-   than the srcpkgcache. Like <literal>Dir::State</literal> the default
-   directory is contained in <literal>Dir::Cache</literal></para>
+   by setting <literal>pkgcache</literal> or <literal>srcpkgcache</literal> to
+   <literal>""</literal>.  This will slow down startup but save disk space. It
+   is probably preferable to turn off the pkgcache rather than the srcpkgcache.
+   Like <literal>Dir::State</literal> the default directory is contained in
+   <literal>Dir::Cache</literal></para>
 
    <para><literal>Dir::Etc</literal> contains the location of configuration files, 
    <literal>sourcelist</literal> gives the location of the sourcelist and 
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index d8c3efab7..16e6a7aa0 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/doc/design.dbk b/doc/design.dbk
new file mode 100644
index 000000000..157e75c1a
--- /dev/null
+++ b/doc/design.dbk
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book 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;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
+]>
+
+<book lang="en">
+
+<title>The APT project design document</title>
+
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Manoj Srivastava</personname><email>srivasta@debian.org</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
+
+<abstract>
+<para>
+This document is an overview of the specifications and design goals of the APT
+project. It also attempts to give a broad description of the implementation
+as well.
+</para>
+</abstract>
+
+<copyright><year>1997</year><holder>Manoj Srivastava</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
+APT, including this document, 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.
+</para>
+<para>
+This is distributed in the hope that it will be useful, but <emphasis>without
+any warranty</emphasis>; without even the implied warranty of merchantability
+or fitness for a particular purpose. See the GNU General Public License for
+more details.
+</para>
+<para>
+You should have received a copy of the GNU General Public License with your
+Debian system, in <literal>/usr/share/common-licenses/GPL</literal>, or with
+the <command>debiandoc-sgml</command> source package as the file
+<literal>COPYING</literal>. If not, write to the Free Software Foundation,
+Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="introduction"><title>Introduction</title>
+<para>
+APT is supposed to be a replacement for dselect, and not a replacement for
+dpkg. However, since addition functionality has been required for APT, and
+given the fact that this is very closely related to dpkg, it is not
+unreasonable to expect that additional functionality in the underlying dpkg
+would also be requested.
+</para>
+<para>
+Deity/dselect are the first introduction that people have to Debian, and
+unfortunately this first impression contributes greatly to the public
+perception of the distribution. It is imperative that this be a showcase for
+Debian, rather than frighten novices away (which has been an accusation often
+levelled at the current system)
+</para>
+</chapter>
+
+<chapter id="ch2"><title>Requirements</title>
+<orderedlist numeration="arabic">
+<listitem>
+<para>
+APT should be a replacement for dselect. Therefore it should have all the
+functionality that dselect has currently. This is the primary means of
+interaction between the user and the package management system, and it should
+be able to handle all tasks involved in installing, upgrading, and routine
+management without having the users take recourse to the underlying management
+system.
+</para>
+</listitem>
+<listitem>
+<para>
+It should be easier to use and less confusing for novice users. The primary
+stimulus for the creation of APT was the perceived intractability, complexity,
+and non-intuitive behavior of the existing user interface, and as such, human
+factors must be a primary mandate of APT.
+</para>
+</listitem>
+<listitem>
+<para>
+It should be able to group packages more flexibly, and possibly allow
+operations based on a group. One should be able to select, or deselect,
+a coherent group of related packages simultaneously, allowing one to add,
+remove, or upgrade functionality to a machine as one step.
+</para>
+</listitem>
+<listitem>
+<para>
+This would allow APT to handle <emphasis>standard installations</emphasis>,
+namely, one could then install a set of packages to enable a machine to
+fulfill specific tasks. Define a few standard installations, and which
+packages are included therein. The packages should be internally consistent.
+</para>
+</listitem>
+<listitem>
+<para>
+Make use of a keywords field in package headers; provide a standard list of
+keywords for people to use. This could be the underpinning to allow the
+previous two requirements to work (though the developers are not constrained
+to implement the previous requirements using keywords)
+</para>
+</listitem>
+<listitem>
+<para>
+Use dependencies, conflicts, and reverse dependencies to properly order
+packages for installation and removal. This has been a complaint in the past
+that the installation methods do not really understand dependencies, causing
+the upgrade process to break, or allowing the removal of packages that left the
+system in an untenable state by breaking the dependencies on packages that were
+dependent on the package being removed. A special emphasis is placed on
+handling pre-dependencies correctly; the target of a predependency has to be
+fully configured before attempting to install the pre-dependent package. Also,
+<emphasis>configure immediately</emphasis> requests mentioned below should be
+handled.
+</para>
+</listitem>
+<listitem>
+<para>
+Handle replacement of a package providing a virtual package with another (for
+example, it has been very difficult replacing <command>sendmail</command> with
+<command>smail</command>, or vice versa), making sure that the dependencies are
+still satisfied.
+</para>
+</listitem>
+<listitem>
+<para>
+Handle source lists for updates from multiple sources. APT should also be able
+to handle diverse methods of acquiring new packages; local filesystem,
+mountable CD-ROM drives, FTP accessible repositories are some of the methods
+that come to mind. Also, the source lists can be separated into categories,
+such as main, contrib, non-us, non-local, non-free, my-very-own, etc. APT
+should be set up to retrieve the Packages files from these multiple source
+lists, as well as retrieving the packages themselves.
+</para>
+</listitem>
+<listitem>
+<para>
+Handle base of source and acquire all Packages files underneath. (possibly
+select based on architecture), this should be a simple extension of the
+previous requirement.
+</para>
+</listitem>
+<listitem>
+<para>
+Handle remote installation (to be implemented maybe in a future version, it
+still needs to be designed). This would ease the burden of maintaining
+multiple Debian machines on a site. In the authors opinion this is a killer
+difference for the distribution, though it may be too hard a problem to be
+implemented with the initial version of APT. However, some thought must be
+given to this to enable APT to retain hooks for future functionality, or at
+least to refrain from methods that may preclude remote activity. It is
+desirable that adding remote installation not require a redesign of APT from
+the ground up.
+</para>
+</listitem>
+<listitem>
+<para>
+Be scalable. Dselect worked a lot better with 400 packages, but at last count
+the number of packages was around twelve hundred and climbing. This also
+requires APT to pay attention to the needs of small machines which are low on
+memory (though this requirement shall diminish as we move towards bigger
+machines, it would still be nice if Debian worked on all old machines where
+Linux itself would work).
+</para>
+</listitem>
+<listitem>
+<para>
+Handle install immediately requests. Some packages, like watchdog, are
+required to be working for the stability of the machine itself. There are
+others which may be required for the correct functioning of a production
+machine, or which are mission critical applications. APT should, in these
+cases, upgrade the packages with minimal downtime; allowing these packages to
+be one of potentially hundreds of packages being upgraded concurrently may
+not satisfy the requirements of the package or the site. (Watchdog, for
+example, if not restarted quickly, may cause the machine to reboot in the
+midst of installation, which may cause havoc on the machine)
+</para>
+</listitem>
+</orderedlist>
+</chapter>
+
+<chapter id="ch3"><title>Procedural description</title>
+<variablelist>
+<varlistentry>
+<term>Set Options</term>
+<listitem>
+<para>
+This process handles setting of user or site options, and configuration of all
+aspects of APT. It allows the user to set the location and order of package
+sources, allowing them to set up source list details, like ftp site locations,
+passwords, etc. Display options may also be set.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Updates</term>
+<listitem>
+<para>
+Build a list of available packages, using source lists or a base location and
+trawling for Packages files (needs to be aware of architecture). This may
+involve finding and retrieving Packages files, storing them locally for
+efficiency, and parsing the data for later use. This would entail contacting
+various underlying access modules (ftp, cdrom mounts, etc) Use a backing store
+for speed. This may also require downloading the actual package files locally
+for speed.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Local status</term>
+<listitem>
+<para>
+Build up a list of packages already installed. This requires reading and
+writing the local??  status file. For remote installation, this should
+probably use similar mechanisms as the Packages file retrieval does. Use
+the backing store for speed. One should consider multiple backing stores,
+one for each machine.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Relationship determination</term>
+<listitem>
+<para>
+Determine forward and reverse dependencies. All known dependency fields should
+be acted upon, since it is fairly cheap to do so. Update the backing store
+with this information.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Selection</term>
+<listitem>
+<para>
+Present the data to the user. Look at Behan Webster's documentation for the
+user interface procedures. (Note: In the authors opinion deletions and reverse
+dependencies should also be presented to the user, in a strictly symmetric
+fashion; this may make it easier to prevent a package being removed that breaks
+dependencies)
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Ordering of package installations and configuration</term>
+<listitem>
+<para>
+Build a list of events. Simple topological sorting gives order of packages
+in dependency order. At certain points in this ordering,
+predependencies/immediate configure directives cause an break in normal
+ordering. We need to insert the uninstall/purge directive in the stream
+(default: as early as possible).
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Action</term>
+<listitem>
+<para>
+Take the order of installations and removals and build up a stream of events
+to send to the packaging system (dpkg). Execute the list of events if
+successful. Do not partially install packages and leave system in broken
+state. Go to The Selection step as needed.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</chapter>
+
+<chapter id="ch4"><title>Modules and interfaces</title>
+<variablelist>
+<varlistentry>
+<term>The user interface module</term>
+<listitem>
+<para>
+Look at Behan Webster's documentation.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Widget set</term>
+<listitem>
+<para>
+Related closely to above Could some one present design decisions of the widget
+set here?
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>pdate Module</term>
+<listitem>
+<para>
+Distinct versions of the same package are recorded separately, but if multiple
+Packages files contain the same version of a package, then only the first one
+is recorded. For this reason, the least expensive update source should be
+listed first (local file system is better than a remote ftp site)
+</para>
+<para>
+This module should interact with the user interface module to set and change
+configuration parameters for the modules listed below. It needs to record that
+information in an on disk data file, to be read on future invocations.
+</para>
+<orderedlist numeration="arabic">
+<listitem>
+<para>
+FTP methods
+</para>
+</listitem>
+<listitem>
+<para>
+mount and file traversal module(s)?
+</para>
+</listitem>
+<listitem>
+<para>
+Other methods ???
+</para>
+</listitem>
+</orderedlist>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Status file parser/generator</term>
+<listitem>
+<para>
+The status file records the current state of the system, listing the packages
+installed, etc. The status file is also one method of communicating with dpkg,
+since it is perfectly permissible for the user to use APT to request packages
+be updated, put others on hold, mark other for removal, etc, and then run
+<literal>dpkg -BORGiE</literal> on a file system.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Package file parser/generator</term>
+<listitem>
+<para>
+Related to above. Handle multiple Packages files, from different
+sources. Each package contains a link back to the packages file structure
+that contains details about the origin of the data.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Dependency module</term>
+<listitem>
+<itemizedlist>
+<listitem>
+<para>
+dependency/conflict determination and linking
+</para>
+</listitem>
+<listitem>
+<para>
+reverse dependency generator. Maybe merged with above
+</para>
+</listitem>
+</itemizedlist>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Package ordering Module</term>
+<listitem>
+<para>
+Create an ordering of the actions to be taken.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Event generator</term>
+<listitem>
+<para>
+module to interact with dpkg
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</chapter>
+
+<chapter id="ch5"><title>Data flow and conversions analysis.</title>
+<screen>
+                                                          ____________
+                                                       __\|ftp modules|
+                                                      /  /|___________|
+                                    _ ____________   /     ________________
+                                    |    update   | /     |mount/local file|
+        |==========================&gt;|   module    |/_____\|  traversals    |
+        |                           |_____________|      /|________________|
+        |                             ^        ^
+        |                             |        |               ______________
+  ______|_______    _ _____ ______    |   _____v________      \|            |
+ |Configuration |   |configuration|   |   |Packages Files|  ===|Status file |
+ |  module      |&lt;=&gt;|    data     |   |   |______________| /  /|____________|
+ |______________|   |_____________|   |        ^          /
+         ^                            |        |         /
+         |                            | _______v_______|/_
+         |                            | |              |    ________________
+         |                            | |              |/_\|   Dependency  |
+         |                            | |backing store |\ /|     Module    |
+         |                            | |______________|  _|_______________|
+         |                             \       ^          /|       ^
+         |                              \      |         /         |
+         |                              _\|____v_______|/__    ____v_______
+         |_____________________________\| User interaction|    |    dpkg   |
+                                       /|_________________|&lt;==&gt;  Invoker  |
+                                                               |___________|
+</screen>
+<para>
+dpkg also interacts with status and available files.
+</para>
+<para>
+The backing store and the associated data structures are the core of APT. All
+modules essentially revolve around the backing store, feeding it data, adding
+and manipulating links and relationships between data in the backing store,
+allowing the user to interact with and modify the data in the backing store,
+and finally writing it out as the status file and possibly issuing directives
+to dpkg.
+</para>
+<para>
+The other focal point for APT is the user interface.
+</para>
+</chapter>
+
+</book>
diff --git a/doc/design.sgml b/doc/design.sgml
deleted file mode 100644
index 67406aa01..000000000
--- a/doc/design.sgml
+++ /dev/null
@@ -1,411 +0,0 @@
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<debiandoc>
-  <book>
-    <titlepag>
-      <title> The APT project design document</title>
-      <author>
-	<name>Manoj Srivastava</name>
-	<email>srivasta@debian.org</email>
-      </author>
-      <version>$Id: design.sgml,v 1.4 2003/02/12 15:05:45 doogie Exp $</version>
-      <abstract>
-	This document is an overview of the specifications and design
-	goals of the APT project. It also attempts to give a broad
-	description of the implementation as well.
-      </abstract>
-      <copyright>
-	<copyrightsummary>Copyright &copy;1997 Manoj Srivastava
-	</copyrightsummary>
-	<p>
-	  APT, including this document, 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.</p>
-	<p>
-	  This is distributed in the hope that it will be useful, but
-	  <em>without any warranty</em>; without even the implied
-	  warranty of merchantability or fitness for a particular
-	  purpose.  See the GNU General Public License for more
-	  details.</p>
-
-	<p>
-	  You should have received a copy of the GNU General Public
-	  License with your Debian system, in
-	  <tt>/usr/share/common-licenses/GPL</tt>, or with the
-	  <prgn/debiandoc-sgml/ source package as the file
-	  <tt>COPYING</tt>.  If not, write to the Free Software
-	  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-	  USA.</p>
-      </copyright>
-    </titlepag>
-    <chapt id="introduction">
-      <heading>Introduction</heading>
-      <p>APT is supposed to be a replacement for dselect, and not a 
-	replacement for dpkg. However, since addition functionality
-	has been required for APT, and given the fact that this is
-	very closely related to dpkg, it is not unreasonable to expect
-	that additional functionality in the underlying dpkg would
-	also be requested.</p>
-
-      <p> Deity/dselect are the first introduction that people have to
-	Debian, and unfortunately this first impression contributes
-	greatly to the public perception of the distribution. It is
-	imperative that this be a showcase for Debian, rather than
-	frighten novices away (which has been an accusation often
-	levelled at the current system)</p>
-    </chapt>
-    <chapt>
-      <heading>Requirements</heading>
-      <p>
-	<enumlist compact="compact">
-	  <item>
-	    <p>
-	      APT should be a replacement for dselect. Therefore it
-	      should have all the functionality that dselect has
-	      currently. This is the primary means of interaction
-	      between the user and the package management system, and
-	      it should be able to handle all tasks involved in
-	      installing, upgrading, and routine management without
-	      having the users take recourse to the underlying
-	      management system.</p>
-	  </item>
-	  <item>
-	    <p>
-	      It should be easier to use and less confusing for novice
-	      users. The primary stimulus for the creation of APT
-	      was the perceived intractability, complexity, and
-	      non-intuitive behavior of the existing user interface,
-	      and as such, human factors must be a primary mandate of
-	      APT.</p>
-	  </item>
-	  <item>
-	    <p>
-	      It should be able to group packages more flexibly, and
-	      possibly allow operations based on a group. One should
-	      be able to select, or deselect, a coherent group of
-	      related packages simultaneously, allowing one to add,
-	      remove, or upgrade functionality to a machine as one
-	      step.
-	    </p>
-	  </item>
-	  <item>
-	    <p>
-	      This would allow APT to handle <em>standard
-		installations</em>, namely, one could then install a
-	      set of packages to enable a machine to fulfill specific
-	      tasks.  Define a few standard installations, and which
-	      packages are included therein. The packages should be
-	      internally consistent.</p>
-	  </item>
-	  <item>
-	    <p>
-	      Make use of a keywords field in package headers; provide
-	      a standard list of keywords for people to use. This
-	      could be the underpinning to allow the previous two
-	      requirements to work (though the developers are not
-	      constrained to implement the previous requirements using
-	      keywords)
-	    </p>
-	  </item>
-	  <item>
-	    <p>
-	      Use dependencies, conflicts, and reverse dependencies to
-	      properly order packages for installation and
-	      removal. This has been a complaint in the past that the
-	      installation methods do not really understand
-	      dependencies, causing the upgrade process to break, or
-	      allowing the removal of packages that left the system in
-	      an untenable state by breaking the dependencies on
-	      packages that were dependent on the package being
-	      removed. A special emphasis is placed on handling
-	      pre-dependencies correctly; the target of a
-	      predependency has to be fully configured before
-	      attempting to install the pre-dependent package. Also,
-	      <em>configure immediately</em> requests mentioned below
-	      should be handled.</p>
-	  </item>
-	  <item>
-	    <p>
-	      Handle replacement of a package providing a virtual
-	      package with another (for example, it has been very
-	      difficult replacing <prgn>sendmail</prgn> with
-	      <prgn>smail</prgn>, or vice versa), making sure that the
-	      dependencies are still satisfied. </p>
-	  </item>
-	  <item>
-	    <p>
-	      Handle source lists for updates from multiple
-	      sources. APT should also be able to handle diverse
-	      methods of acquiring new packages; local filesystem,
-	      mountable CD-ROM drives, FTP accessible repositories are
-	      some of the methods that come to mind.  Also, the source
-	      lists can be separated into categories, such as main,
-	      contrib, non-us, non-local, non-free, my-very-own,
-	      etc. APT should be set up to retrieve the Packages
-	      files from these multiple source lists, as well as
-	      retrieving the packages themselves. </p>
-	  </item>
-	  <item>
-	    <p>
-	      Handle base of source and acquire all Packages files
-	      underneath.  (possibly select based on architecture),
-	      this should be a simple extension of the previous
-	      requirement.</p>
-	  </item>
-	  <item>
-	    <p>
-	      Handle remote installation (to be implemented maybe in a
-	      future version, it still needs to be designed). This
-	      would ease the burden of maintaining multiple Debian
-	      machines on a site. In the authors opinion this is a
-	      killer difference for the distribution, though it may be
-	      too hard a problem to be implemented with the initial
-	      version of APT. However, some thought must be given to
-	      this to enable APT to retain hooks for future
-	      functionality, or at least to refrain from methods that
-	      may preclude remote activity. It is desirable that
-	      adding remote installation not require a redesign of
-	      APT from the ground up.</p>
-	  </item>
-	  <item>
-	    <p>
-	      Be scalable. Dselect worked a lot better with 400
-	      packages, but at last count the number of packages was
-	      around twelve hundred and climbing. This also requires
-	      APT to pay attention to the needs of small machines
-	      which are low on memory (though this requirement shall
-	      diminish as we move towards bigger machines, it would
-	      still be nice if Debian worked on all old machines where
-	      Linux itself would work).</p>
-	  </item>
-	  <item>
-	    <p>
-	      Handle install immediately requests. Some packages, like
-	      watchdog, are required to be working for the stability
-	      of the machine itself. There are others which may be
-	      required for the correct functioning of a production
-	      machine, or which are mission critical
-	      applications. APT should, in these cases, upgrade the
-	      packages with minimal downtime; allowing these packages
-	      to be one of potentially hundreds of packages being
-	      upgraded concurrently may not satisfy the requirements
-	      of the package or the site. (Watchdog, for example, if
-	      not restarted quickly, may cause the machine to reboot
-	      in the midst of installation, which may cause havoc on
-	      the machine)</p>
-	  </item>
-	</enumlist> 
-      </p>
-    </chapt>
-    <chapt>
-      <heading>Procedural description</heading>
-      <p><taglist>
-	  <tag>Set Options</tag>
-	  <item>
-	    <p>
-	      This process handles setting of user or
-	      site options, and configuration of all aspects of
-	      APT. It allows the user to set the location and order
-	      of package sources, allowing them to set up source list
-	      details, like ftp site locations, passwords,
-	      etc. Display options may also be set.</p>
-	  </item>
-	  <tag>Updates</tag>
-	  <item>
-	    <p>
-	      Build a list of available packages, using
-	      source lists or a base location and trawling for
-	      Packages files (needs to be aware of architecture). This
-	      may involve finding and retrieving Packages files,
-	      storing them locally for efficiency, and parsing the
-	      data for later use. This would entail contacting various
-	      underlying access modules (ftp, cdrom mounts, etc) Use a
-	      backing store for speed. This may also require
-	      downloading the actual package files locally for
-	      speed.</p>
-	  </item>
-	  <tag>Local status</tag>
-	  <item>
-	    <p>
-	      Build up a list of packages already
-	      installed. This requires reading and writing the local??
-	      status file. For remote installation, this should
-	      probably use similar mechanisms as the Packages file
-	      retrieval does. Use the backing store for speed. One
-	      should consider multiple backing stores, one for each
-	      machine.
-	    </p>
-	  </item>
-	  <tag>Relationship determination</tag>
-	  <item>
-	    <p>
-	      Determine forward and reverse dependencies. All known
-	      dependency fields should be acted upon, since it is
-	      fairly cheap to do so. Update the backing store with
-	      this information.</p>
-	  </item>
-	  <tag>Selection</tag>
-	  <item>
-	    <p>
-	      Present the data to the user. Look at Behan Webster's
-	      documentation for the user interface procedures. (Note:
-	      In the authors opinion deletions and reverse
-	      dependencies should also be presented to the user, in a
-	      strictly symmetric fashion; this may make it easier to
-	      prevent a package being removed that breaks
-	      dependencies)
-	    </p>
-	  </item>
-	  <tag>Ordering of package installations and configuration </tag>
-	  <item>
-	    <p>
-	      Build a list of events. Simple topological sorting gives
-	      order of packages in dependency order. At certain points
-	      in this ordering, predependencies/immediate configure
-	      directives cause an break in normal ordering. We need to
-	      insert the uninstall/purge directive in the stream
-	      (default: as early as possible).</p>
-	  </item>
-	  <tag>Action</tag>
-	  <item>
-	    <p>
-	      Take the order of installations and removals and build
-	      up a stream of events to send to the packaging system
-	      (dpkg). Execute the list of events if successful. Do not
-	      partially install packages and leave system in broken
-	      state. Go to The Selection step as needed.</p>
-	  </item>
-
-	</taglist>
-      </p>
-    </chapt>
-    <chapt>
-      <heading>Modules and interfaces</heading>
-      <p><taglist>
-	  <tag>The user interface module</tag>
-	  <item>
-	    <p> Look at Behan Webster's documentation.</p> 
-	  </item>
-	  <tag>Widget set</tag>
-	  <item>
-	    <p>
-	      Related closely to above Could some one present design
-	      decisions of the widget set here?</p>
-	  </item>
-	  <tag>pdate Module</tag>
-	  <item>
-	    <p>	    
-	      Distinct versions of the same package are recorded
-	      separately, but if multiple Packages files contain the
-	      same version of a package, then only the first one is
-	      recorded. For this reason, the least expensive update
-	      source should be listed first (local file system is
-	      better than a remote ftp site)</p>
-	    <p>
-	      This module should interact with the user interface
-	      module to set and change configuration parameters for
-	      the modules listed below. It needs to record that
-	      information in an on disk data file, to be read on
-	      future invocations. </p>
-	    <p><enumlist>
-		<item>
-		  <p>FTP methods</p>
-		</item>
-		<item>
-		  <p>mount and file traversal module(s)?</p>
-		</item>
-		<item>
-		  <p>Other methods ???</p>
-		</item>
-	      </enumlist>
-	    </p>
-	  </item>
-	  <tag>Status file parser/generator</tag>
-	  <item>
-	    <p> 
-	      The status file records the current state of the system,
-	      listing the packages installed, etc. The status file is
-	      also one method of communicating with dpkg, since it is
-	      perfectly permissible for the user to use APT to
-	      request packages be updated, put others on hold, mark
-	      other for removal, etc, and then run <tt>dpkg
-		-BORGiE</tt> on a file system.</p>
-	  </item>
-	  <tag>Package file parser/generator</tag>
-	  <item>
-	    <p>
-	      Related to above. Handle multiple Packages files, from
-	      different sources. Each package contains a link back to
-	      the packages file structure that contains details about
-	      the origin of the data. </p>
-	  </item>
-	  <tag>Dependency module</tag>
-	  <item>
-	    <p><list>
-		<item>
-		  <p>dependency/conflict determination and linking</p>
-		</item>
-		<item>
-		  <p>reverse dependency generator. Maybe merged with above</p>
-		</item>
-	      </list>
-	    </p>
-	  </item>
-	  <tag>Package ordering Module</tag>
-	  <item>
-	    <p>Create an ordering of the actions to be taken.</p>
-	  </item>
-	  <tag>Event generator</tag>
-	  <item>
-	    <p>module to interact with dpkg</p>
-	  </item>
-	</taglist>
-    </chapt>
-    <chapt>
-      <heading>Data flow and conversions analysis.</heading>
-      <p> 
-	<example>
-                                                          ____________
-                                                       __\|ftp modules|
-                                                      /  /|___________|
-                                    _ ____________   /     ________________
-                                    |    update   | /     |mount/local file|
-        |==========================>|   module    |/_____\|  traversals    |
-        |                           |_____________|      /|________________|
-        |                             ^        ^
-        |                             |        |               ______________
-  ______|_______    _ _____ ______    |   _____v________      \|            |
- |Configuration |   |configuration|   |   |Packages Files|  ===|Status file |
- |  module      |<=>|    data     |   |   |______________| /  /|____________|
- |______________|   |_____________|   |        ^          /
-         ^                            |        |         /
-         |                            | _______v_______|/_
-         |                            | |              |    ________________
-         |                            | |              |/_\|   Dependency  |
-         |                            | |backing store |\ /|     Module    |
-         |                            | |______________|  _|_______________|
-         |                             \       ^          /|       ^
-         |                              \      |         /         |
-         |                              _\|____v_______|/__    ____v_______
-         |_____________________________\| User interaction|    |    dpkg   |
-                                       /|_________________|<==>|  Invoker  |
-                                                               |___________|
-
-	</example>
-      <p> dpkg also interacts with status and available files.</p>
-
-
-      <p>
-	The backing store and the associated data structures are the
-	core of APT. All modules essentially revolve around the
-	backing store, feeding it data, adding and manipulating links
-	and relationships between data in the backing store, allowing
-	the user to interact with and modify the data in the backing
-	store, and finally writing it out as the status file and
-	possibly issuing directives to dpkg.</p>
-
-      <p>The other focal point for APT is the user interface.</p> 
-    </chapt>
-  </book>
-</debiandoc>
diff --git a/doc/docbook-html-style.xsl b/doc/docbook-html-style.xsl
new file mode 100644
index 000000000..e4af9f557
--- /dev/null
+++ b/doc/docbook-html-style.xsl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <!-- Import our base stylesheet -->
+  <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml-1_1/chunk.xsl" />
+
+  <!-- Since we use xsltproc (not saxon), add a workaround to ensure UTF-8 -->
+  <xsl:template xmlns="http://www.w3.org/1999/xhtml" name="head.content.generator">
+    <xsl:param name="node" select="."/>
+    <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  </xsl:template>
+
+  <xsl:template name="generate.html.title"/>
+
+  <xsl:template match="releaseinfo" mode="titlepage.mode">
+    <xsl:apply-imports/>
+    <hr/>
+  </xsl:template>
+
+  <xsl:param name="root.filename">index</xsl:param>
+
+  <!-- We do not want a title in HTML. -->
+  <xsl:param name="generate.meta.abstract" select="0"/>
+
+  <!-- We do not want the first subsection on the same page as content. -->
+  <xsl:param name="chunk.first.sections" select="0"/>
+  <xsl:param name="chunk.section.depth" select="0"/>
+  <xsl:param name="chunker.output.indent" select="'yes'"/>
+
+  <xsl:param name="use.id.as.filename" select="1"/>
+
+  <xsl:param name="toc.section.depth" select="1"/>
+  <xsl:param name="generate.section.toc.level" select="0"/>
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="section.autolabel" select="1"/>
+
+  <xsl:param name="generate.css.header" select="1"/>
+
+</xsl:stylesheet>
diff --git a/doc/docbook-text-style.xsl b/doc/docbook-text-style.xsl
new file mode 100644
index 000000000..376dded52
--- /dev/null
+++ b/doc/docbook-text-style.xsl
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml-1_1/docbook.xsl" />
+
+  <!-- Parameters for optimal text output. -->
+  <xsl:param name="callout.graphics" select="0"/>
+  <xsl:param name="callout.unicode" select="0"/>
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+
+  <!-- Centering and aligning title elements. -->
+  <xsl:template match="/*/title[position()=1]" mode="titlepage.mode">
+    <br/>
+    <center>
+      <xsl:apply-imports/>
+    </center>
+    <br/>
+    <hr/> <!-- No underline, but at least something. -->
+  </xsl:template>
+  <xsl:template match="author|editor" mode="titlepage.mode">
+    <center>
+      <xsl:apply-imports/>
+    </center>
+  </xsl:template>
+
+  <xsl:template match="releaseinfo" mode="titlepage.mode">
+    <center>
+      <xsl:apply-imports/>
+    </center>
+    <hr/>
+  </xsl:template>
+
+  <!-- Dirty hack to get a left margin for paragraphs etc. -->
+  <xsl:template match="legalnotice/*
+        |chapter/*[not(name(.)='section') and not(name(.)='title')]
+        |section/*[not(name(.)='section') and not(name(.)='title')]
+        |appendix/*[not(name(.)='section') and not(name(.)='title')]
+        |footnote/*">
+    <xsl:copy><table><tr><td>&#xa0;&#xa0;&#xa0;</td><td>
+    <xsl:apply-imports/>
+    </td></tr></table></xsl:copy>
+  </xsl:template>
+
+  <!-- Skip URLs if it has something to print. -->
+  <xsl:template match="ulink[.!='']">
+    <xsl:copy-of select="."/>
+  </xsl:template>
+  <!-- Print URLs if nothing to print. -->
+  <xsl:template match="ulink[.='']">
+    <xsl:value-of select="@url"/>
+  </xsl:template>
+
+  <!-- Make clear where notes etc. begin and end. -->
+  <xsl:template match="caution|important|note|tip|warning">
+    <table width="80%" border="1">
+      <colgroup>
+        <col align="justify"/>
+      </colgroup>
+      <tbody>
+        <tr>
+          <td align="justify">
+            <xsl:apply-imports/>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/doc/dpkg-tech.dbk b/doc/dpkg-tech.dbk
new file mode 100644
index 000000000..660ccabc9
--- /dev/null
+++ b/doc/dpkg-tech.dbk
@@ -0,0 +1,896 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book 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;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
+]>
+
+<book lang="en">
+
+<title>dpkg technical manual</title>
+
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Tom Lees</personname><email>tom@lpsg.demon.co.uk</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
+
+<abstract>
+<para>
+This document describes the minimum necessary workings for the APT dselect
+replacement. It gives an overall specification of what its external interface
+must look like for compatibility, and also gives details of some internal
+quirks.
+</para>
+</abstract>
+
+<copyright><year>1997</year><holder>Tom Lees</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
+APT and this document are free software; you can redistribute them and/or
+modify them under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+</para>
+<para>
+For more details, on Debian systems, see the file
+/usr/share/common-licenses/GPL for the full license.
+</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="ch1"><title>Quick summary of dpkg's external interface</title>
+
+<section id="control"><title>Control files</title>
+<para>
+The basic dpkg package control file supports the following major features:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+5 types of dependencies:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+Pre-Depends, which must be satisfied before a package may be unpacked
+</para>
+</listitem>
+<listitem>
+<para>
+Depends, which must be satisfied before a package may be configured
+</para>
+</listitem>
+<listitem>
+<para>
+Recommends, to specify a package which if not installed may severely limit the
+usefulness of the package
+</para>
+</listitem>
+<listitem>
+<para>
+Suggests, to specify a package which may increase the productivity of the
+package
+</para>
+</listitem>
+<listitem>
+<para>
+Conflicts, to specify a package which must NOT be installed in order for the
+package to be configured
+</para>
+</listitem>
+<listitem>
+<para>
+Breaks, to specify a package which is broken by the package and which should
+therefore not be configured while broken
+</para>
+</listitem>
+</itemizedlist>
+<para>
+Each of these dependencies can specify a version and a depedency on that
+version, for example "&lt;= 0.5-1", "== 2.7.2-1", etc. The comparators
+available are:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+"&lt;&lt;" - less than
+</para>
+</listitem>
+<listitem>
+<para>
+"&lt;=" - less than or equal to
+</para>
+</listitem>
+<listitem>
+<para>
+"&gt;&gt;" - greater than
+</para>
+</listitem>
+<listitem>
+<para>
+"&gt;=" - greater than or equal to
+</para>
+</listitem>
+<listitem>
+<para>
+"==" - equal to
+</para>
+</listitem>
+</itemizedlist>
+</listitem>
+<listitem>
+<para>
+The concept of "virtual packages", which many other packages may provide,
+using the Provides mechanism. An example of this is the "httpd" virtual
+package, which all web servers should provide. Virtual package names may be
+used in dependency headers. However, current policy is that virtual packages
+do not support version numbers, so dependencies on virtual packages with
+versions will always fail.
+</para>
+</listitem>
+<listitem>
+<para>
+Several other control fields, such as Package, Version, Description, Section,
+Priority, etc., which are mainly for classification purposes. The package
+name must consist entirely of lowercase characters, plus the characters '+',
+'-', and '.'. Fields can extend across multiple lines - on the second and
+subsequent lines, there is a space at the beginning instead of a field name
+and a ':'. Empty lines must consist of the text " .", which will be ignored,
+as will the initial space for other continuation lines. This feature is
+usually only used in the Description field.
+</para>
+</listitem>
+</itemizedlist>
+</section>
+
+<section id="s1.2"><title>The dpkg status area</title>
+<para>
+The "dpkg status area" is the term used to refer to the directory where dpkg
+keeps its various status files (GNU would have you call it the dpkg shared
+state directory). This is always, on Debian systems, /var/lib/dpkg. However,
+the default directory name should not be hard-coded, but #define'd, so that
+alteration is possible (it is available via configure in dpkg 1.4.0.9 and
+above). Of course, in a library, code should be allowed to override the
+default directory, but the default should be part of the library (so that
+the user may change the dpkg admin dir simply by replacing the library).
+</para>
+<para>
+Dpkg keeps a variety of files in its status area. These are discussed later
+on in this document, but a quick summary of the files is here:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+available - this file contains a concatenation of control information from all
+the packages which dpkg knows about. This is updated using the dpkg commands
+"--update-avail &lt;file&gt;", "--merge-avail &lt;file&gt;", and
+"--clear-avail".
+</para>
+</listitem>
+<listitem>
+<para>
+status - this file contains information on the following things for every
+package:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+Whether it is installed, not installed, unpacked, removed, failed
+configuration, or half-installed (deconfigured in favour of another package).
+</para>
+</listitem>
+<listitem>
+<para>
+Whether it is selected as install, hold, remove, or purge.
+</para>
+</listitem>
+<listitem>
+<para>
+If it is "ok" (no installation problems), or "not-ok".
+</para>
+</listitem>
+<listitem>
+<para>
+It usually also contains the section and priority (so that dselect may classify
+packages not in available)
+</para>
+</listitem>
+<listitem>
+<para>
+For packages which did not initially appear in the "available" file when they
+were installed, the other control information for them.
+</para>
+</listitem>
+</itemizedlist>
+<para>
+The exact format for the "Status:" field is:
+</para>
+<screen>
+      Status: Want Flag Status
+</screen>
+<para>
+Where <replaceable>Want</replaceable> may be one of
+<emphasis>unknown</emphasis>, <emphasis>install</emphasis>,
+<emphasis>hold</emphasis>, <emphasis>deinstall</emphasis>,
+<emphasis>purge</emphasis>. <replaceable>Flag</replaceable> may
+be one of <emphasis>ok</emphasis>, <emphasis>reinstreq</emphasis>,
+<emphasis>hold</emphasis>,
+<emphasis>hold-reinstreq</emphasis>. <replaceable>Status</replaceable> may
+be one of <emphasis>not-installed</emphasis>, <emphasis>unpacked</emphasis>,
+<emphasis>half-configured</emphasis>, <emphasis>installed</emphasis>,
+<emphasis>half-installed</emphasis> <emphasis>config-files</emphasis>,
+<emphasis>post-inst-failed</emphasis>, <emphasis>removal-failed</emphasis>.
+The states are as follows:-
+</para>
+<variablelist>
+<varlistentry>
+<term>not-installed</term>
+<listitem>
+<para>
+No files are installed from the package, it has no config files left, it
+uninstalled cleanly if it ever was installed.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>unpacked</term>
+<listitem>
+<para>
+The basic files have been unpacked (and are listed in
+/var/lib/dpkg/info/[package].list. There are config files present, but the
+postinst script has _NOT_ been run.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>half-configured</term>
+<listitem>
+<para>
+The package was installed and unpacked, but the postinst script failed in some
+way.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>installed</term>
+<listitem>
+<para>
+All files for the package are installed, and the configuration was also
+successful.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>half-installed</term>
+<listitem>
+<para>
+An attempt was made to remove the packagem but there was a failure in the
+prerm script.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>config-files</term>
+<listitem>
+<para>
+The package was "removed", not "purged". The config files are left, but
+nothing else.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>post-inst-failed</term>
+<listitem>
+<para>
+Old name for half-configured. Do not use.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>removal-failed</term>
+<listitem>
+<para>
+Old name for half-installed. Do not use.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+<para>
+The two last items are only left in dpkg for compatibility - they are
+understood by it, but never written out in this form.
+</para>
+<para>
+Please see the dpkg source code, <literal>lib/parshelp.c</literal>,
+<emphasis>statusinfos</emphasis>, <emphasis>eflaginfos</emphasis> and
+<emphasis>wantinfos</emphasis> for more details.
+</para>
+</listitem>
+<listitem>
+<para>
+info - this directory contains files from the control archive of every
+package currently installed. They are installed with a prefix of
+"&lt;packagename&gt;.". In addition to this, it also contains a file
+called &lt;package&gt;.list for every package, which contains a list
+of files. Note also that the control file is not copied into here; it
+is instead found as part of status or available.
+</para>
+</listitem>
+<listitem>
+<para>
+methods - this directory is reserved for "method"-specific files - each
+"method" has a subdirectory underneath this directory (or at least,
+it can have). In addition, there is another subdirectory "mnt", where
+misc. filesystems (floppies, CD-ROMs, etc.) are mounted.
+</para>
+</listitem>
+<listitem>
+<para>
+alternatives - directory used by the "update-alternatives" program. It
+contains one file for each "alternatives" interface, which contains
+information about all the needed symlinked files for each alternative.
+</para>
+</listitem>
+<listitem>
+<para>
+diversions - file used by the "dpkg-divert" program. Each diversion takes
+three lines. The first is the package name (or ":" for user diversion), the
+second the original filename, and the third the diverted filename.
+</para>
+</listitem>
+<listitem>
+<para>
+updates - directory used internally by dpkg. This is discussed later, in the
+section <xref linkend="updates"/>.
+</para>
+</listitem>
+<listitem>
+<para>
+parts - temporary directory used by dpkg-split
+</para>
+</listitem>
+</itemizedlist>
+</section>
+
+<section id="s1.3"><title>The dpkg library files</title>
+<para>
+These files are installed under /usr/lib/dpkg (usually), but
+/usr/local/lib/dpkg is also a possibility (as Debian policy dictates). Under
+this directory, there is a "methods" subdirectory. The methods subdirectory in
+turn contains any number of subdirectories for each general method processor
+(note that one set of method scripts can, and is, used for more than one of
+the methods listed under dselect).
+</para>
+<para>
+The following files may be found in each of these subdirectories:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+names - One line per method, two-digit priority to appear on menu at
+beginning, followed by a space, the name, and then another space and
+the short description.
+</para>
+</listitem>
+<listitem>
+<para>
+desc.&lt;name&gt; - Contains the long description displayed by dselect
+when the cursor is put over the &lt;name&gt; method.
+</para>
+</listitem>
+<listitem>
+<para>
+setup - Script or program which sets up the initial values to be used
+by this method. Called with first argument as the status area directory
+(/var/lib/dpkg), second argument as the name of the method (as in the
+directory name), and the third argument as the option (as in the names file).
+</para>
+</listitem>
+<listitem>
+<para>
+install - Script/program called when the "install" option of dselect is run
+with this method. Same arguments as for setup.
+</para>
+</listitem>
+<listitem>
+<para>
+update - Script/program called when the "update" option of dselect is
+run. Same arguments as for setup/install.
+</para>
+</listitem>
+</itemizedlist>
+</section>
+
+<section id="s1.4"><title>The "dpkg" command-line utility</title>
+
+<section id="s1.4.1"><title>"Documented" command-line interfaces</title>
+<para>
+As yet unwritten. You can refer to the other manuals for now. See
+<citerefentry><refentrytitle>dpkg</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+</para>
+</section>
+
+<section id="s1.4.2"><title>Environment variables which dpkg responds to</title>
+<itemizedlist>
+<listitem>
+<para>
+DPKG_NO_TSTP - if set to a non-null value, this variable causes dpkg to run a
+child shell process instead of sending itself a SIGTSTP, when the user selects
+to background the dpkg process when it asks about conffiles.
+</para>
+</listitem>
+<listitem>
+<para>
+SHELL - used to determine which shell to run in the case when DPKG_NO_TSTP
+is set.
+</para>
+</listitem>
+<listitem>
+<para>
+CC - used as the C compiler to call to determine the target architecture. The
+default is "gcc".
+</para>
+</listitem>
+<listitem>
+<para>
+PATH - dpkg checks that it can find at least the following files in the path
+when it wants to run package installation scripts, and gives an error if it
+cannot find all of them:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+ldconfig
+</para>
+</listitem>
+<listitem>
+<para>
+start-stop-daemon
+</para>
+</listitem>
+<listitem>
+<para>
+install-info
+</para>
+</listitem>
+<listitem>
+<para>
+update-rc.d
+</para>
+</listitem>
+</itemizedlist>
+</listitem>
+</itemizedlist>
+</section>
+
+<section id="s1.4.3"><title>Assertions</title>
+<para>
+The dpkg utility itself is required for quite a number of packages, even if
+they have been installed with a tool totally separate from dpkg. The reason
+for this is that some packages, in their pre-installation scripts, check that
+your version of dpkg supports certain features. This was broken from the
+start, and it should have actually been a control file header "Dpkg-requires",
+or similar. What happens is that the configuration scripts will abort or
+continue according to the exit code of a call to dpkg, which will stop them
+from being wrongly configured.
+</para>
+<para>
+These special command-line options, which simply return as true or false are
+all prefixed with "--assert-". Here is a list of them (without the prefix):-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+support-predepends - Returns success or failure according to whether a version
+of dpkg which supports predepends properly (1.1.0 or above) is installed,
+according to the database.
+</para>
+</listitem>
+<listitem>
+<para>
+working-epoch - Return success or failure according to whether a version of
+dpkg which supports epochs in version properly (1.4.0.7 or above) is installed,
+according to the database.
+</para>
+</listitem>
+</itemizedlist>
+<para>
+Both these options check the status database to see what version of the
+"dpkg" package is installed, and check it against a known working version.
+</para>
+</section>
+
+<section id="s1.4.4"><title>--predep-package</title>
+<para>
+This strange option is described as follows in the source code:
+</para>
+<screen>
+/* Print a single package which:
+ *  (a) is the target of one or more relevant predependencies.
+ *  (b) has itself no unsatisfied pre-dependencies.
+ * If such a package is present output is the Packages file entry,
+ *  which can be massaged as appropriate.
+ * Exit status:
+ *  0 = a package printed, OK
+ *  1 = no suitable package available
+ *  2 = error
+ */
+</screen>
+<para>
+On further inspection of the source code, it appears that what is does is
+this:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+Looks at the packages in the database which are selected as "install",
+and are installed.
+</para>
+</listitem>
+<listitem>
+<para>
+It then looks at the Pre-Depends information for each of these packages
+from the available file. When it find a package for which any of the
+pre-dependencies are not satisfied, it breaks from the loop through the
+packages.
+</para>
+</listitem>
+<listitem>
+<para>
+It then looks through the unsatisfied pre-dependencies, and looks for
+packages which would satisfy this pre-dependency, stopping on the first
+it finds. If it finds none, it bombs out with an error.
+</para>
+</listitem>
+<listitem>
+<para>
+It then continues this for every dependency of the initial package.
+</para>
+</listitem>
+</itemizedlist>
+<para>
+Eventually, it writes out the record of all the packages to satisfy the
+pre-dependencies. This is used by the disk method to make sure that its
+dependency ordering is correct. What happens is that all pre-depending
+packages are first installed, then it runs dpkg -iGROEB on the directory,
+which installs in the order package files are found. Since pre-dependencies
+mean that a package may not even be unpacked unless they are satisfied, it
+is necessary to do this (usually, since all the package files are unpacked
+in one phase, the configured in another, this is not needed).
+</para>
+</section>
+
+</section>
+
+</chapter>
+
+<chapter id="ch2"><title>dpkg-deb and .deb file internals</title>
+<para>
+This chapter describes the internals to the "dpkg-deb" tool, which is used by
+"dpkg" as a back-end. dpkg-deb has its own tar extraction functions, which is
+the source of many problems, as it does not support long filenames, using
+extension blocks.
+</para>
+
+<section id="s2.1"><title>The .deb archive format</title>
+<para>
+The main principal of the new-format Debian archive (I won't describe the old
+format - for that have a look at deb-old.5), is that the archive really is an
+archive - as used by "ar" and friends. However, dpkg-deb uses this format
+internally, rather than calling "ar". Inside this archive, there are usually
+the following members:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+debian-binary
+</para>
+</listitem>
+<listitem>
+<para>
+control.tar.gz
+</para>
+</listitem>
+<listitem>
+<para>
+data.tar.gz
+</para>
+</listitem>
+</itemizedlist>
+<para>
+The debian-binary member consists simply of the string "2.0", indicating
+the format version. control.tar.gz contains the control files (and scripts),
+and the data.tar.gz contains the actual files to populate the filesystem
+with. Both tarfiles extract straight into the current directory. Information
+on the tar formats can be found in the GNU tar info page. Since dpkg-deb
+calls "tar -cf" to build packages, the Debian packages use the GNU extensions.
+</para>
+</section>
+
+<section id="s2.2"><title>The dpkg-deb command-line</title>
+<para>
+dpkg-deb documents itself thoroughly with its '--help' command-line
+option. However, I am including a reference to these for
+completeness. dpkg-deb supports the following options:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+--build (-b) &lt;dir&gt; - builds a .deb archive, takes a directory which
+contains all the files as an argument. Note that the directory
+&lt;dir&gt;/DEBIAN will be packed separately into the control archive.
+</para>
+</listitem>
+<listitem>
+<para>
+--contents (-c) &lt;debfile&gt; - Lists the contents of the "data.tar.gz"
+member.
+</para>
+</listitem>
+<listitem>
+<para>
+--control (-e) &lt;debfile&gt; - Extracts the control archive into a directory
+called DEBIAN. Alternatively, with another argument, it will extract it into a
+different directory.
+</para>
+</listitem>
+<listitem>
+<para>
+--info (-I) &lt;debfile&gt; - Prints the contents of the "control" file in the
+control archive to stdout. Alternatively, giving it other arguments will cause
+it to print the contents of those files instead.
+</para>
+</listitem>
+<listitem>
+<para>
+--field (-f) &lt;debfile&gt; &lt;field&gt; ... - Prints any number of fields
+from the "control" file. Giving it extra arguments limits the fields it prints
+to only those specified. With no command-line arguments other than a filename,
+it is equivalent to -I and just the .deb filename.
+</para>
+</listitem>
+<listitem>
+<para>
+--extract (-x) &lt;debfile&gt; &lt;dir&gt; - Extracts the data archive of a
+debian package under the directory &lt;dir&gt;.
+</para>
+</listitem>
+<listitem>
+<para>
+--vextract (-X) &lt;debfile&gt; &lt;dir&gt; - Same as --extract, except it
+is equivalent of giving tar the '-v' option - it prints the filenames as it
+extracts them.
+</para>
+</listitem>
+<listitem>
+<para>
+--fsys-tarfile &lt;debfile&gt; - This option outputs a gunzip'd version of
+data.tar.gz to stdout.
+</para>
+</listitem>
+<listitem>
+<para>
+--new - sets the archive format to be used to the new Debian format
+</para>
+</listitem>
+<listitem>
+<para>
+--old - sets the archive format to be used to the old Debian format
+</para>
+</listitem>
+<listitem>
+<para>
+--debug - Tells dpkg-deb to produce debugging output
+</para>
+</listitem>
+<listitem>
+<para>
+--nocheck - Tells dpkg-deb not to check the sanity of the control file
+</para>
+</listitem>
+<listitem>
+<para>
+--help (-h) - Gives a help message
+</para>
+</listitem>
+<listitem>
+<para>
+--version - Shows the version number
+</para>
+</listitem>
+<listitem>
+<para>
+--licence/--license (UK/US spellings) - Shows a brief outline of the GPL
+</para>
+</listitem>
+</itemizedlist>
+
+<section id="s2.2.1"><title>Internal checks used by dpkg-deb when building packages</title>
+<para>
+Here is a list of the internal checks used by dpkg-deb when building
+packages. It is in the order they are done.
+</para>
+<itemizedlist>
+<listitem>
+<para>
+First, the output Debian archive argument, if it is given, is checked using
+stat. If it is a directory, an internal flag is set. This check is only made
+if the archive name is specified explicitly on the command-line. If the
+argument was not given, the default is the directory name, with ".deb"
+appended.
+</para>
+</listitem>
+<listitem>
+<para>
+Next, the control file is checked, unless the --nocheck flag was specified on
+the command-line. dpkg-deb will bomb out if the second argument to --build was
+a directory, and --nocheck was specified. Note that dpkg-deb will not be able
+to determine the name of the package in this case. In the control file, the
+following things are checked:-
+</para>
+<itemizedlist>
+<listitem>
+<para>
+The package name is checked to see if it contains any invalid characters (see
+<xref linkend="control"/> for this).
+</para>
+</listitem>
+<listitem>
+<para>
+The priority field is checked to see if it uses standard values, and
+user-defined values are warned against. However, note that this check is now
+redundant, since the control file no longer contains the priority - the
+changes file now does this.
+</para>
+</listitem>
+<listitem>
+<para>
+The control file fields are then checked against the standard list of fields
+which appear in control files, and any "user-defined" fields are reported as
+warnings.
+</para>
+</listitem>
+<listitem>
+<para>
+dpkg-deb then checks that the control file contains a valid version number.
+</para>
+</listitem>
+</itemizedlist>
+</listitem>
+<listitem>
+<para>
+After this, in the case where a directory was specified to build the .deb file
+in, the filename is created as "directory/pkg_ver.deb" or
+"directory/pkg_ver_arch.deb", depending on whether the control file contains
+an architecture field.
+</para>
+</listitem>
+<listitem>
+<para>
+Next, dpkg-deb checks for the &lt;dir&gt;/DEBIAN directory. It complains if it
+doesn't exist, or if it has permissions &lt; 0755, or &gt; 0775.
+</para>
+</listitem>
+<listitem>
+<para>
+It then checks that all the files in this subdir are either symlinks or plain
+files, and have permissions between 0555 and 0775.
+</para>
+</listitem>
+<listitem>
+<para>
+The conffiles file is then checked to see if the filenames are too
+long. Warnings are produced for each that is. After this, it checks
+that the package provides initial copies of each of these conffiles,
+and that they are all plain files.
+</para>
+</listitem>
+</itemizedlist>
+</section>
+
+</section>
+
+</chapter>
+
+<chapter id="ch3"><title>dpkg internals</title>
+<para>
+This chapter describes the internals of dpkg itself. Although the low-level
+formats are quite simple, what dpkg does in certain cases often does not make
+sense.
+</para>
+
+<section id="updates"><title>Updates</title>
+<para>
+This describes the /var/lib/dpkg/updates directory. The function of this
+directory is somewhat strange, and seems only to be used internally. A
+function called cleanupdates is called whenever the database is scanned. This
+function in turn uses
+<citerefentry><refentrytitle>scandir</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+to sort the files in this directory. Files who names do not consist entirely
+of digits are discarded. dpkg also causes a fatal error if any of the
+filenames are different lengths.
+</para>
+<para>
+After having scanned the directory, dpkg in turn parses each file the same way
+it parses the status file (they are sorted by the scandir to be in numerical
+order). After having done this, it then writes the status information back to
+the "status" file, and removes all the "updates" files.
+</para>
+<para>
+These files are created internally by dpkg's "checkpoint" function, and are
+cleaned up when dpkg exits cleanly.
+</para>
+<para>
+Juding by the use of the updates directory I would call it a Journal. Inorder
+to efficiently ensure the complete integrity of the status file dpkg will
+"checkpoint" or journal all of it's activities in the updates directory. By
+merging the contents of the updates directory (in order!!) against the original
+status file it can get the precise current state of the system, even in the
+event of a system failure while dpkg is running.
+</para>
+<para>
+The other option would be to sync-rewrite the status file after each operation,
+which would kill performance.
+</para>
+<para>
+It is very important that any program that uses the status file abort if the
+updates directory is not empty!  The user should be informed to run dpkg
+manually (what options though??) to correct the situation.
+</para>
+</section>
+
+<section id="s3.2"><title>What happens when dpkg reads the database</title>
+<para>
+First, the status file is read. This gives dpkg an initial idea of the
+packages that are there. Next, the updates files are read in, overriding the
+status file, and if necessary, the status file is re-written, and updates files
+are removed. Finally, the available file is read. The available file is read
+with flags which preclude dpkg from updating any status information from it,
+though - installed version, etc., and is also told to record that the packages
+it reads this time are available, not installed.
+</para>
+<para>
+More information on updates is given above.
+</para>
+</section>
+
+<section id="s3.3"><title>How dpkg compares version numbers</title>
+<para>
+Version numbers consist of three parts: the epoch, the upstream version, and
+the Debian revision. Dpkg compares these parts in that order. If the epochs
+are different, it returns immediately, and so on.
+</para>
+<para>
+However, the important part is how it compares the versions which are
+essentially stored as just strings. These are compared in two distinct
+parts: those consisting of numerical characters (which are evaluated, and
+then compared), and those consisting of other characters. When comparing
+non-numerical parts, they are compared as the character values (ASCII),
+but non-alphabetical characters are considered "greater than" alphabetical
+ones. Also note that longer strings (after excluding differences where
+numerical values are equal) are considered "greater than" shorter ones.
+</para>
+<para>
+Here are a few examples of how these rules apply:-
+</para>
+<screen>
+15 &gt; 10
+0010 == 10
+
+d.r &gt; dsr
+32.d.r == 0032.d.r
+d.rnr &lt; d.rnrn
+</screen>
+</section>
+
+</chapter>
+
+</book>
diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
deleted file mode 100644
index ce0c5fa83..000000000
--- a/doc/dpkg-tech.sgml
+++ /dev/null
@@ -1,511 +0,0 @@
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
-<title>dpkg technical manual</title>
-
-<author>Tom Lees <email>tom@lpsg.demon.co.uk</email></author>
-<version>$Id: dpkg-tech.sgml,v 1.3 2003/02/12 15:05:45 doogie Exp $</version>
-
-<abstract>
-This document describes the minimum necessary workings for the APT dselect
-replacement. It gives an overall specification of what its external interface
-must look like for compatibility, and also gives details of some internal
-quirks.
-</abstract>
-
-<copyright>
-Copyright &copy; Tom Lees, 1997.
-<p>
-APT and this document are free software; you can redistribute them and/or
-modify them under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-<p>
-For more details, on Debian systems, see the file
-/usr/share/common-licenses/GPL for the full license.
-</copyright>
-
-<toc sect>
-
-<chapt>Quick summary of dpkg's external interface
-<sect id="control">Control files
-
-<p>
-The basic dpkg package control file supports the following major features:-
-
-<list>
-<item>5 types of dependencies:-
-	<list>
-	<item>Pre-Depends, which must be satisfied before a package may be
-	unpacked
-	<item>Depends, which must be satisfied before a package may be
-	configured
-	<item>Recommends, to specify a package which if not installed may
-	severely limit the usefulness of the package
-	<item>Suggests, to specify a package which may increase the
-	productivity of the package
-	<item>Conflicts, to specify a package which must NOT be installed
-	in order for the package to be configured
-	<item>Breaks, to specify a package which is broken by the
-	package and which should therefore not be configured while broken
-	</list>
-Each of these dependencies can specify a version and a depedency on that
-version, for example "<= 0.5-1", "== 2.7.2-1", etc. The comparators available
-are:-
-	<list>
-	<item>"&lt;&lt;" - less than
-	<item>"&lt;=" - less than or equal to
-	<item>"&gt;&gt;" - greater than
-	<item>"&gt;=" - greater than or equal to
-	<item>"==" - equal to
-	</list>
-<item>The concept of "virtual packages", which many other packages may provide,
-using the Provides mechanism. An example of this is the "httpd" virtual package,
-which all web servers should provide. Virtual package names may be used in
-dependency headers. However, current policy is that virtual packages do not
-support version numbers, so dependencies on virtual packages with versions
-will always fail.
-<item>Several other control fields, such as Package, Version, Description,
-Section, Priority, etc., which are mainly for classification purposes. The
-package name must consist entirely of lowercase characters, plus the characters
-'+', '-', and '.'. Fields can extend across multiple lines - on the second
-and subsequent lines, there is a space at the beginning instead of a field
-name and a ':'. Empty lines must consist of the text " .", which will be
-ignored, as will the initial space for other continuation lines. This feature
-is usually only used in the Description field.
-</list>
-
-<sect>The dpkg status area
-
-<p>
-The "dpkg status area" is the term used to refer to the directory where dpkg
-keeps its various status files (GNU would have you call it the dpkg shared
-state directory). This is always, on Debian systems, /var/lib/dpkg. However,
-the default directory name should not be hard-coded, but #define'd, so that
-alteration is possible (it is available via configure in dpkg 1.4.0.9 and
-above). Of course, in a library, code should be allowed to override the
-default directory, but the default should be part of the library (so that
-the user may change the dpkg admin dir simply by replacing the library).
-
-<p>
-Dpkg keeps a variety of files in its status area. These are discussed later
-on in this document, but a quick summary of the files is here:-
-
-<list>
-<item>available - this file contains a concatenation of control information
-from all the packages which dpkg knows about. This is updated using the dpkg
-commands "--update-avail &lt;file&gt;", "--merge-avail &lt;file&gt;", and
-"--clear-avail".
-<item>status - this file contains information on the following things for
-every package:-
-	<list>
-	<item>Whether it is installed, not installed, unpacked, removed,
-		failed configuration, or half-installed (deconfigured in
-		favour of another package).
-	<item>Whether it is selected as install, hold, remove, or purge.
-	<item>If it is "ok" (no installation problems), or "not-ok".
-	<item>It usually also contains the section and priority (so that
-		dselect may classify packages not in available)
-	<item>For packages which did not initially appear in the "available"
-		file when they were installed, the other control information
-		for them.
-	</list>
-   <p>
-   The exact format for the "Status:" field is:
-   <example>
-      Status: Want Flag Status
-   </example>
-   Where <var>Want</> may be one of <em>unknown</>, <em>install</>,
-   <em>hold</>, <em>deinstall</>, <em>purge</>. <var>Flag</>
-   may be one of <em>ok</>, <em>reinstreq</>, <em>hold</>,
-   <em>hold-reinstreq</>.
-   <var>Status</> may be one of <em>not-installed</>, <em>unpacked</>, 
-   <em>half-configured</>, <em>installed</>, <em>half-installed</>
-   <em>config-files</>, <em>post-inst-failed</>, <em>removal-failed</>.
-   The states are as follows:-
-   <taglist>
-     <tag>not-installed
-     <item>No files are installed from the package, it has no config files
-        left, it uninstalled cleanly if it ever was installed.
-     <tag>unpacked
-     <item>The basic files have been unpacked (and are listed in
-        /var/lib/dpkg/info/[package].list. There are config files present,
-        but the postinst script has _NOT_ been run.
-     <tag>half-configured
-     <item>The package was installed and unpacked, but the postinst script
-        failed in some way.
-     <tag>installed
-     <item>All files for the package are installed, and the configuration
-        was also successful.
-     <tag>half-installed
-     <item>An attempt was made to remove the packagem but there was a failure
-        in the prerm script.
-     <tag>config-files
-     <item>The package was "removed", not "purged". The config files are left,
-        but nothing else.
-     <tag>post-inst-failed
-     <item>Old name for half-configured. Do not use.
-     <tag>removal-failed
-     <item>Old name for half-installed. Do not use.
-   </taglist>
-   The two last items are only left in dpkg for compatibility - they are
-   understood by it, but never written out in this form.
-
-   <p>
-   Please see the dpkg source code, <tt>lib/parshelp.c</tt>, 
-   <em>statusinfos</>, <em>eflaginfos</> and <em>wantinfos</> for more 
-   details.
-   
-<item>info - this directory contains files from the control archive of every
-package currently installed. They are installed with a prefix of "&lt;packagename&gt;.".
-In addition to this, it also contains a file called &lt;package&gt;.list for every
-package, which contains a list of files. Note also that the control file is
-not copied into here; it is instead found as part of status or available.
-<item>methods - this directory is reserved for "method"-specific files - each
-"method" has a subdirectory underneath this directory (or at least, it can
-have). In addition, there is another subdirectory "mnt", where misc.
-filesystems (floppies, CD-ROMs, etc.) are mounted.
-<item>alternatives - directory used by the "update-alternatives" program. It
-contains one file for each "alternatives" interface, which contains information
-about all the needed symlinked files for each alternative.
-<item>diversions - file used by the "dpkg-divert" program. Each diversion takes
-three lines. The first is the package name (or ":" for user diversion), the
-second the original filename, and the third the diverted filename.
-<item>updates - directory used internally by dpkg. This is discussed later,
-in the section <ref id="updates">.
-<item>parts - temporary directory used by dpkg-split
-</list>
-
-<sect>The dpkg library files
-
-<p>
-These files are installed under /usr/lib/dpkg (usually), but
-/usr/local/lib/dpkg is also a possibility (as Debian policy dictates). Under
-this directory, there is a "methods" subdirectory. The methods subdirectory
-in turn contains any number of subdirectories for each general method
-processor (note that one set of method scripts can, and is, used for more than
-one of the methods listed under dselect).
-
-<p>
-The following files may be found in each of these subdirectories:-
-
-<list>
-<item>names - One line per method, two-digit priority to appear on menu
-at beginning, followed by a space, the name, and then another space and the
-short description.
-<item>desc.&lt;name&gt; - Contains the long description displayed by dselect
-when the cursor is put over the &lt;name&gt; method.
-<item>setup - Script or program which sets up the initial values to be used
-by this method. Called with first argument as the status area directory
-(/var/lib/dpkg), second argument as the name of the method (as in the directory
-name), and the third argument as the option (as in the names file).
-<item>install - Script/program called when the "install" option of dselect is
-run with this method. Same arguments as for setup.
-<item>update - Script/program called when the "update" option of dselect is
-run. Same arguments as for setup/install.
-</list>
-
-<sect>The "dpkg" command-line utility
-
-<sect1>"Documented" command-line interfaces
-
-<p>
-As yet unwritten. You can refer to the other manuals for now. See
-<manref name="dpkg" section="8">.
-
-<sect1>Environment variables which dpkg responds to
-
-<p>
-<list>
-<item>DPKG_NO_TSTP - if set to a non-null value, this variable causes dpkg to
-run a child shell process instead of sending itself a SIGTSTP, when the user
-selects to background the dpkg process when it asks about conffiles.
-<item>SHELL - used to determine which shell to run in the case when
-DPKG_NO_TSTP is set.
-<item>CC - used as the C compiler to call to determine the target architecture.
-The default is "gcc".
-<item>PATH - dpkg checks that it can find at least the following files in the
-path when it wants to run package installation scripts, and gives an error if
-it cannot find all of them:-
-	<list>
-	<item>ldconfig
-	<item>start-stop-daemon
-	<item>install-info
-	<item>update-rc.d
-	</list>
-</list>
-
-<sect1>Assertions
-
-<p>
-The dpkg utility itself is required for quite a number of packages, even if
-they have been installed with a tool totally separate from dpkg. The reason for
-this is that some packages, in their pre-installation scripts, check that your
-version of dpkg supports certain features. This was broken from the start, and
-it should have actually been a control file header "Dpkg-requires", or similar.
-What happens is that the configuration scripts will abort or continue according
-to the exit code of a call to dpkg, which will stop them from being wrongly
-configured.
-
-<p>
-These special command-line options, which simply return as true or false are
-all prefixed with "--assert-". Here is a list of them (without the prefix):-
-
-<list>
-<item>support-predepends - Returns success or failure according to whether
-a version of dpkg which supports predepends properly (1.1.0 or above) is
-installed, according to the database.
-<item>working-epoch - Return success or failure according to whether a version
-of dpkg which supports epochs in version properly (1.4.0.7 or above) is
-installed, according to the database.
-</list>
-
-<p>
-Both these options check the status database to see what version of the "dpkg"
-package is installed, and check it against a known working version.
-
-<sect1>--predep-package
-
-<p>
-This strange option is described as follows in the source code:
-
-<example>
-/* Print a single package which:
- *  (a) is the target of one or more relevant predependencies.
- *  (b) has itself no unsatisfied pre-dependencies.
- * If such a package is present output is the Packages file entry,
- *  which can be massaged as appropriate.
- * Exit status:
- *  0 = a package printed, OK
- *  1 = no suitable package available
- *  2 = error
- */
-</example>
-
-<p>
-On further inspection of the source code, it appears that what is does is
-this:-
-
-<list>
-<item>Looks at the packages in the database which are selected as "install",
-and are installed.
-<item>It then looks at the Pre-Depends information for each of these packages
-from the available file. When it find a package for which any of the
-pre-dependencies are not satisfied, it breaks from the loop through the packages.
-<item>It then looks through the unsatisfied pre-dependencies, and looks for
-packages which would satisfy this pre-dependency, stopping on the first it
-finds. If it finds none, it bombs out with an error.
-<item>It then continues this for every dependency of the initial package.
-</list>
-
-Eventually, it writes out the record of all the packages to satisfy the
-pre-dependencies. This is used by the disk method to make sure that its
-dependency ordering is correct. What happens is that all pre-depending
-packages are first installed, then it runs dpkg -iGROEB on the directory,
-which installs in the order package files are found. Since pre-dependencies
-mean that a package may not even be unpacked unless they are satisfied, it is
-necessary to do this (usually, since all the package files are unpacked in one
-phase, the configured in another, this is not needed).
-
-<chapt>dpkg-deb and .deb file internals
-
-<p>
-This chapter describes the internals to the "dpkg-deb" tool, which is used
-by "dpkg" as a back-end. dpkg-deb has its own tar extraction functions, which
-is the source of many problems, as it does not support long filenames, using
-extension blocks.
-
-<sect>The .deb archive format
-
-<p>
-The main principal of the new-format Debian archive (I won't describe the old
-format - for that have a look at deb-old.5), is that the archive really is
-an archive - as used by "ar" and friends. However, dpkg-deb uses this format
-internally, rather than calling "ar". Inside this archive, there are usually
-the following members:-
-
-<list>
-<item>debian-binary
-<item>control.tar.gz
-<item>data.tar.gz
-</list>
-
-<p>
-The debian-binary member consists simply of the string "2.0", indicating the
-format version. control.tar.gz contains the control files (and scripts), and
-the data.tar.gz contains the actual files to populate the filesystem with.
-Both tarfiles extract straight into the current directory. Information on the
-tar formats can be found in the GNU tar info page. Since dpkg-deb calls
-"tar -cf" to build packages, the Debian packages use the GNU extensions.
-
-<sect>The dpkg-deb command-line 
-
-<p>
-dpkg-deb documents itself thoroughly with its '--help' command-line option.
-However, I am including a reference to these for completeness. dpkg-deb
-supports the following options:-
-
-<list>
-<item>--build (-b) &lt;dir&gt; - builds a .deb archive, takes a directory which
-contains all the files as an argument. Note that the directory
-&lt;dir&gt;/DEBIAN will be packed separately into the control archive.
-<item>--contents (-c) &lt;debfile&gt; - Lists the contents of the "data.tar.gz"
-member.
-<item>--control (-e) &lt;debfile&gt; - Extracts the control archive into a
-directory called DEBIAN. Alternatively, with another argument, it will extract
-it into a different directory.
-<item>--info (-I) &lt;debfile&gt; - Prints the contents of the "control" file
-in the control archive to stdout. Alternatively, giving it other arguments will
-cause it to print the contents of those files instead.
-<item>--field (-f) &lt;debfile&gt; &lt;field&gt; ... - Prints any number of
-fields from the "control" file. Giving it extra arguments limits the fields it
-prints to only those specified. With no command-line arguments other than a
-filename, it is equivalent to -I and just the .deb filename.
-<item>--extract (-x) &lt;debfile&gt; &lt;dir&gt; - Extracts the data archive
-of a debian package under the directory &lt;dir&gt;.
-<item>--vextract (-X) &lt;debfile&gt; &lt;dir&gt; - Same as --extract, except
-it is equivalent of giving tar the '-v' option - it prints the filenames as
-it extracts them.
-<item>--fsys-tarfile &lt;debfile&gt; - This option outputs a gunzip'd version
-of data.tar.gz to stdout.
-<item>--new - sets the archive format to be used to the new Debian format
-<item>--old - sets the archive format to be used to the old Debian format
-<item>--debug - Tells dpkg-deb to produce debugging output
-<item>--nocheck - Tells dpkg-deb not to check the sanity of the control file
-<item>--help (-h) - Gives a help message
-<item>--version - Shows the version number
-<item>--licence/--license (UK/US spellings) - Shows a brief outline of the GPL
-</list>
-
-<sect1>Internal checks used by dpkg-deb when building packages
-
-<p>
-Here is a list of the internal checks used by dpkg-deb when building packages.
-It is in the order they are done.
-
-<list>
-<item>First, the output Debian archive argument, if it is given, is checked
-using stat. If it is a directory, an internal flag is set. This check is only
-made if the archive name is specified explicitly on the command-line. If the
-argument was not given, the default is the directory name, with ".deb"
-appended.
-<item>Next, the control file is checked, unless the --nocheck flag was
-specified on the command-line. dpkg-deb will bomb out if the second argument
-to --build was a directory, and --nocheck was specified. Note that dpkg-deb
-will not be able to determine the name of the package in this case. In the
-control file, the following things are checked:-
-	<list>
-	<item>The package name is checked to see if it contains any invalid
-	characters (see <ref id="control"> for this).
-	<item>The priority field is checked to see if it uses standard values,
-	and user-defined values are warned against. However, note that this
-	check is now redundant, since the control file no longer contains
-	the priority - the changes file now does this.
-	<item>The control file fields are then checked against the standard
-	list of fields which appear in control files, and any "user-defined"
-	fields are reported as warnings.
-	<item>dpkg-deb then checks that the control file contains a valid
-	version number.
-	</list>
-<item>After this, in the case where a directory was specified to build the
-.deb file in, the filename is created as "directory/pkg_ver.deb" or
-"directory/pkg_ver_arch.deb", depending on whether the control file contains
-an architecture field.
-<item>Next, dpkg-deb checks for the &lt;dir&gt;/DEBIAN directory. It complains
-if it doesn't exist, or if it has permissions &lt; 0755, or &gt; 0775.
-<item>It then checks that all the files in this subdir are either symlinks
-or plain files, and have permissions between 0555 and 0775.
-<item>The conffiles file is then checked to see if the filenames are too
-long. Warnings are produced for each that is. After this, it checks that
-the package provides initial copies of each of these conffiles, and that
-they are all plain files.
-</list>
-
-<chapt>dpkg internals
-
-<p>
-This chapter describes the internals of dpkg itself. Although the low-level
-formats are quite simple, what dpkg does in certain cases often does not
-make sense.
-
-<sect id="updates">Updates
-
-<p>
-This describes the /var/lib/dpkg/updates directory. The function of this
-directory is somewhat strange, and seems only to be used internally. A function
-called cleanupdates is called whenever the database is scanned. This function
-in turn uses <manref name="scandir" section="3">, to sort the files in this
-directory. Files who names do not consist entirely of digits are discarded.
-dpkg also causes a fatal error if any of the filenames are different lengths.
-
-<p>
-After having scanned the directory, dpkg in turn parses each file the same way
-it parses the status file (they are sorted by the scandir to be in numerical
-order). After having done this, it then writes the status information back
-to the "status" file, and removes all the "updates" files.
-
-<p>
-These files are created internally by dpkg's "checkpoint" function, and are
-cleaned up when dpkg exits cleanly.
-
-<p>
-Juding by the use of the updates directory I would call it a Journal. Inorder
-to efficiently ensure the complete integrity of the status file dpkg will
-"checkpoint" or journal all of it's activities in the updates directory. By
-merging the contents of the updates directory (in order!!) against the 
-original status file it can get the precise current state of the system,
-even in the event of a system failure while dpkg is running.
-
-<p> 
-The other option would be to sync-rewrite the status file after each 
-operation, which would kill performance.
-
-<p>
-It is very important that any program that uses the status file abort if
-the updates directory is not empty! The user should be informed to run dpkg
-manually (what options though??) to correct the situation.
-
-<sect>What happens when dpkg reads the database
-
-<p>
-First, the status file is read. This gives dpkg an initial idea of the packages
-that are there. Next, the updates files are read in, overriding the status
-file, and if necessary, the status file is re-written, and updates files are
-removed. Finally, the available file is read. The available file is read
-with flags which preclude dpkg from updating any status information from it,
-though - installed version, etc., and is also told to record that the packages
-it reads this time are available, not installed.
-
-<p>
-More information on updates is given above.
-
-<sect>How dpkg compares version numbers
-
-<p>
-Version numbers consist of three parts: the epoch, the upstream version, and
-the Debian revision. Dpkg compares these parts in that order. If the epochs
-are different, it returns immediately, and so on.
-
-<p>
-However, the important part is how it compares the versions which are
-essentially stored as just strings. These are compared in two distinct parts:
-those consisting of numerical characters (which are evaluated, and then
-compared), and those consisting of other characters. When comparing
-non-numerical parts, they are compared as the character values (ASCII), but
-non-alphabetical characters are considered "greater than" alphabetical ones.
-Also note that longer strings (after excluding differences where numerical
-values are equal) are considered "greater than" shorter ones.
-
-<p>
-Here are a few examples of how these rules apply:-
-
-<example>
-15 > 10
-0010 == 10
-
-d.r > dsr
-32.d.r == 0032.d.r
-d.rnr < d.rnrn
-</example>
-
-</book>
diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt
index 790f2f1ee..14e9528c8 100644
--- a/doc/external-dependency-solver-protocol.txt
+++ b/doc/external-dependency-solver-protocol.txt
@@ -5,6 +5,14 @@ external dependency solvers. The protocol is called APT EDSP, for "APT
 External Dependency Solver Protocol".
 
 
+## Terminology
+
+In the following we use the term **architecture qualified package name**
+(or *arch-qualified package names* for short) to refer to package
+identifiers of the form "package:arch" where "package" is a package name
+and "arch" a dpkg architecture.
+
+
 ## Components
 
 - **APT**: we know this one.
@@ -62,6 +70,7 @@ configuration documentation for more, and more up to date, information.
 - **Dir::Bin::Solvers**: absolute path of the directory where to look for
   external solvers. Defaults to `/usr/lib/apt/solvers`.
 
+
 ## Protocol
 
 When configured to use an external solver, APT will resort to it to
@@ -132,9 +141,9 @@ The following **configuration fields** are supported in request stanzas:
 The following **action fields** are supported in request stanzas:
 
 - **Install:** (optional, defaults to the empty string) A space
-  separated list of package names, with *no version attached*, to
-  install. This field denotes a list of packages that the user wants to
-  install, usually via an APT `install` request.
+  separated list of arch-qualified package names, with *no version
+  attached*, to install. This field denotes a list of packages that the
+  user wants to install, usually via an APT `install` request.
 
 - **Remove:** (optional, defaults to the empty string) Same syntax of
   Install. This field denotes a list of packages that the user wants to
@@ -201,7 +210,7 @@ field. The following fields are supported in package stanzas:
 - **APT-Candidate:** (optional, defaults to `no`). Allowed values:
   `yes`, `no`. When set to `yes`, the corresponding package is the APT
   candidate for installation among all available packages with the same
-  name.
+  name and architecture.
 
 - **APT-Automatic:** (optional, defaults to `no`). Allowed values:
   `yes`, `no`. When set to `yes`, the corresponding package is marked by
@@ -218,6 +227,7 @@ field. The following fields are supported in package stanzas:
   Release file entry (Origin, Label, Codename, etc.) in the format of
   APT_PREFERENCES(5).
 
+
 ### Answer
 
 An answer from the external solver to APT is either a *solution* or an
@@ -226,11 +236,11 @@ An answer from the external solver to APT is either a *solution* or an
 The following invariant on **exit codes** must hold true. When the
 external solver is *able to find a solution*, it will write the solution
 to standard output and then exit with an exit code of 0. When the
-external solver is *unable to find a solution* (and s aware of that), it
-will write an error to standard output and then exit with an exit code
-of 0. An exit code other than 0 will be interpreted as a solver crash
-with no meaningful error about dependency resolution to convey to the
-user.
+external solver is *unable to find a solution* (and is aware of that),
+it will write an error to standard output and then exit with an exit
+code of 0. An exit code other than 0 will be interpreted as a solver
+crash with no meaningful error about dependency resolution to convey to
+the user.
 
 
 #### Solution
diff --git a/doc/files.dbk b/doc/files.dbk
new file mode 100644
index 000000000..f513e0008
--- /dev/null
+++ b/doc/files.dbk
@@ -0,0 +1,393 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book 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;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
+]>
+
+<book lang="en">
+
+<title>APT Files</title>
+
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Jason Gunthorpe</personname><email>jgg@debian.org</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
+
+<abstract>
+<para>
+This document describes the complete implementation and format of the installed
+APT directory structure. It also serves as guide to how APT views the Debian
+archive.
+</para>
+</abstract>
+
+<copyright><year>1998-1999</year><holder>Jason Gunthorpe</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
+"APT" and this document are free software; you can redistribute them and/or
+modify them under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+</para>
+<para>
+For more details, on Debian systems, see the file
+/usr/share/common-licenses/GPL for the full license.
+</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="ch1"><title>Introduction</title>
+
+<section id="s1.1"><title>General</title>
+<para>
+This document serves two purposes. The first is to document the installed
+directory structure and the format and purpose of each file. The second
+purpose is to document how APT views the Debian archive and deals with multiple
+package files.
+</para>
+<para>
+The var directory structure is as follows:
+</para>
+<screen>
+  /var/lib/apt/
+		lists/
+		       partial/
+		periodic/
+		extended_states
+		cdroms.list
+  /var/cache/apt/
+		  archives/
+		          partial/
+		  pkgcache.bin
+		  srcpkgcache.bin
+  /etc/apt/
+	    sources.list.d/
+	    apt.conf.d/
+	    preferences.d/
+	    trusted.gpg.d/
+	    sources.list
+	    apt.conf
+	    apt_preferences
+	    trusted.gpg
+  /usr/lib/apt/
+	        methods/
+			 bzip2
+			 cdrom
+			 copy
+			 file
+			 ftp
+			 gpgv
+			 gzip
+			 http
+			 https
+			 lzma
+			 rred
+			 rsh
+			 ssh
+</screen>
+<para>
+As is specified in the FHS 2.1 /var/lib/apt is used for application data that
+is not expected to be user modified. /var/cache/apt is used for regeneratable
+data and is where the package cache and downloaded .debs go. /etc/apt is the
+place where configuration should happen and /usr/lib/apt is the place where the
+apt and other packages can place binaries which can be used by the acquire
+system of APT.
+</para>
+</section>
+
+</chapter>
+
+<chapter id="ch2"><title>Files</title>
+
+<section id="s2.1"><title>Files and fragment directories in /etc/apt</title>
+<para>
+All files in /etc/apt are used to modify specific aspects of APT. To enable
+other packages to ship needed configuration herself all these files have a
+fragment directory packages can place their files in instead of mangling with
+the main files. The main files are therefore considered to be only used by the
+user and not by a package. The documentation omits this directories most of
+the time to be easier readable, so every time the documentation includes a
+reference to a main file it really means the file or the fragment directories.
+</para>
+</section>
+
+<section id="s2.2"><title>Distribution Source list (sources.list)</title>
+<para>
+The distribution source list is used to locate archives of the debian
+distribution. It is designed to support any number of active sources and to
+support a mix of source media. The file lists one source per line, with the
+fastest source listed first. The format of each line is:
+</para>
+<para>
+<replaceable>type uri args</replaceable>
+</para>
+<para>
+The first item, <replaceable>type</replaceable>, indicates the format for the
+remainder of the line. It is designed to indicate the structure of the
+distribution the line is talking about. Currently the only defined values are
+<emphasis>deb</emphasis> and <emphasis>deb-src</emphasis> which indicate a
+standard debian (source) archive with a dists directory. More about these
+types and the URI specification can be found in the sources.list manpage.
+</para>
+
+<section id="s2.2.1"><title>Hashing the URI</title>
+<para>
+All permanent information acquired from any of the sources is stored in the
+lists directory. Thus, there must be a way to relate the filename in the lists
+directory to a line in the sourcelist. To simplify things this is done by
+quoting the URI and treating _'s as quoteable characters and converting /
+to _. The URI spec says this is done by converting a sensitive character
+into %xx where xx is the hexadecimal representation from the ASCII character
+set. Examples:
+</para>
+<screen>
+http://www.debian.org/archive/dists/stable/binary-i386/Packages
+/var/lib/apt/lists/www.debian.org_archive_dists_stable_binary-i386_Packages
+
+cdrom:Debian 1.3/debian/Packages
+/var/lib/apt/info/Debian%201.3_debian_Packages
+</screen>
+<para>
+The other alternative that was considered was to use a deep directory structure
+but this poses two problems, it makes it very difficult to prune directories
+back when sources are no longer used and complicates the handling of the
+partial directory. This gives a very simple way to deal with all of the
+situations that can arise. Also note that the same rules described in the
+<emphasis>Archive Directory</emphasis> section regarding the partial sub dir
+apply here as well.
+</para>
+</section>
+
+</section>
+
+<section id="s2.3"><title>Extended States File (extended_states)</title>
+<para>
+The extended_states file serves the same purpose as the normal dpkg status
+file (/var/lib/dpkg/status) except that it stores information unique to
+apt. This includes currently only the autoflag but is open to store more
+unique data that come up over time. It duplicates nothing from the normal
+dpkg status file. Please see other APT documentation for a discussion of
+the exact internal behavior of these fields. The Package and the Architecture
+field are placed directly before the new fields to indicate which package
+they apply to. The new fields are as follows:
+</para>
+<variablelist>
+<varlistentry>
+<term>Auto-Installed</term>
+<listitem>
+<para>
+The Auto flag can be 1 (Yes) or 0 (No) and controls whether the package was
+automatical installed to satisfy a dependency or if the user requested the
+installation
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</section>
+
+<section id="s2.4"><title>Binary Package Cache (srcpkgcache.bin and pkgcache.bin)</title>
+<para>
+Please see cache.sgml for a complete description of what this file
+is. The cache file is updated whenever the contents of the lists
+directory changes. If the cache is erased, corrupted or of a non-matching
+version it will be automatically rebuilt by all of the tools that need
+it. <emphasis>srcpkgcache.bin</emphasis> contains a cache of all of the
+package files in the source list. This allows regeneration of the cache
+when the status files change to use a prebuilt version for greater speed.
+</para>
+</section>
+
+<section id="s2.5"><title>Downloads Directory (archives)</title>
+<para>
+The archives directory is where all downloaded .deb archives go. When the file
+transfer is initiated the deb is placed in partial. Once the file is fully
+downloaded and its MD5 hash and size are verified it is moved from partial
+into archives/. Any files found in archives/ can be assumed to be verified.
+</para>
+<para>
+No directory structure is transferred from the receiving site and all .deb file
+names conform to debian conventions. No short (msdos) filename should be
+placed in archives. If the need arises .debs should be unpacked, scanned and
+renamed to their correct internal names. This is mostly to prevent file name
+conflicts but other programs may depend on this if convenient. A conforming
+.deb is one of the form, name_version_arch.deb. Our archive scripts do not
+handle epochs, but they are necessary and should be re-inserted. If necessary
+_'s and :'s in the fields should be quoted using the % convention. It must be
+possible to extract all 3 fields by examining the file name. Downloaded .debs
+must be found in one of the package lists with an exact name + version match..
+</para>
+</section>
+
+<section id="s2.6"><title>The Methods Directory (/usr/lib/apt/methods)</title>
+<para>
+The Methods directory is more fully described in the APT Methods interface
+document.
+</para>
+</section>
+
+<section id="s2.7"><title>The Configuration File (/etc/apt/apt.conf)</title>
+<para>
+The configuration file (and the associated fragments directory
+/etc/apt/apt.conf.d/) is described in the apt.conf manpage.
+</para>
+</section>
+
+<section id="s2.8"><title>The trusted.gpg File (/etc/apt/trusted.gpg)</title>
+<para>
+The trusted.gpg file (and the files in the associated fragments directory
+/etc/apt/trusted.gpg.d/) is a binary file including the keyring used by apt to
+validate that the information (e.g. the Release file) it downloads are really
+from the distributor it clams to be and is unmodified and is therefore the last
+step in the chain of trust between the archive and the end user. This security
+system is described in the apt-secure manpage.
+</para>
+</section>
+
+<section id="s2.9"><title>The Release File</title>
+<para>
+This file plays an important role in how APT presents the archive to the
+user. Its main purpose is to present a descriptive name for the source of
+each version of each package. It also is used to detect when new versions
+of debian are released. It augments the package file it is associated with
+by providing meta information about the entire archive which the Packages
+file describes.
+</para>
+<para>
+The full name of the distribution for presentation to the user is formed as
+'label version archive', with a possible extended name being 'label version
+archive component'.
+</para>
+<para>
+The file is formed as the package file (RFC-822) with the following tags
+defined:
+</para>
+<variablelist>
+<varlistentry>
+<term>Archive</term>
+<listitem>
+<para>
+This is the common name we give our archives, such as
+<emphasis>stable</emphasis> or <emphasis>unstable</emphasis>.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Component</term>
+<listitem>
+<para>
+Refers to the sub-component of the archive, <emphasis>main</emphasis>,
+<emphasis>contrib</emphasis> etc. Component may be omitted if there are no
+components for this archive.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Version</term>
+<listitem>
+<para>
+This is a version string with the same properties as in the Packages file. It
+represents the release level of the archive.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Origin</term>
+<listitem>
+<para>
+This specifies who is providing this archive. In the case of Debian the string
+will read 'Debian'. Other providers may use their own string
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Label</term>
+<listitem>
+<para>
+This carries the encompassing name of the distribution. For Debian proper this
+field reads 'Debian'. For derived distributions it should contain their proper
+name.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Architecture</term>
+<listitem>
+<para>
+When the archive has packages for a single architecture then the Architecture
+is listed here. If a mixed set of systems are represented then this should
+contain the keyword <emphasis>mixed</emphasis>.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>NotAutomatic</term>
+<listitem>
+<para>
+A Yes/No flag indicating that the archive is extremely unstable and its
+version's should never be automatically selected. This is to be used by
+experimental.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Description</term>
+<listitem>
+<para>
+Description is used to describe the release. For instance experimental would
+contain a warning that the packages have problems.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+<para>
+The location of the Release file in the archive is very important, it must be
+located in the same location as the packages file so that it can be located in
+all situations. The following is an example for the current stable release,
+1.3.1r6
+</para>
+<screen>
+Archive: stable
+Component: main
+Version: 1.3.1r6
+Origin: Debian
+Label: Debian
+Architecture: i386
+</screen>
+<para>
+This is an example of experimental,
+</para>
+<screen>
+Archive: experimental
+Version: 0
+Origin: Debian
+Label: Debian
+Architecture: mixed
+NotAutomatic: Yes
+</screen>
+<para>
+And unstable,
+</para>
+<screen>
+Archive: unstable
+Component: main
+Version: 2.1
+Origin: Debian
+Label: Debian
+Architecture: i386
+</screen>
+</section>
+
+</chapter>
+
+
+</book>
diff --git a/doc/files.sgml b/doc/files.sgml
deleted file mode 100644
index 56c7f574d..000000000
--- a/doc/files.sgml
+++ /dev/null
@@ -1,345 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
-<title>APT Files</title>
-
-<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: files.sgml,v 1.12 2003/04/26 23:26:13 doogie Exp $</version>
-
-<abstract>
-This document describes the complete implementation and format of the 
-installed APT directory structure. It also serves as guide to how APT 
-views the Debian archive.
-</abstract>
-
-<copyright>
-Copyright &copy; Jason Gunthorpe, 1998-1999.
-<p>
-"APT" and this document are free software; you can redistribute them and/or
-modify them under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-<p>
-For more details, on Debian systems, see the file
-/usr/share/common-licenses/GPL for the full license.
-</copyright>
-
-<toc sect>
-
-<chapt>Introduction
-<!-- General		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>General
-
-<p>
-This document serves two purposes. The first is to document the installed
-directory structure and the format and purpose of each file. The second
-purpose is to document how APT views the Debian archive and deals with 
-multiple package files.
-
-<p>
-The var directory structure is as follows:
-<example>
-  /var/lib/apt/
-		lists/
-		       partial/
-		periodic/
-		extended_states
-		cdroms.list
-  /var/cache/apt/
-		  archives/
-		          partial/
-		  pkgcache.bin
-		  srcpkgcache.bin
-  /etc/apt/
-	    sources.list.d/
-	    apt.conf.d/
-	    preferences.d/
-	    trusted.gpg.d/
-	    sources.list
-	    apt.conf
-	    apt_preferences
-	    trusted.gpg
-  /usr/lib/apt/
-	        methods/
-			 bzip2
-			 cdrom
-			 copy
-			 file
-			 ftp
-			 gpgv
-			 gzip
-			 http
-			 https
-			 lzma
-			 rred
-			 rsh
-			 ssh
-</example>
-
-<p>
-As is specified in the FHS 2.1 /var/lib/apt is used for application 
-data that is not expected to be user modified. /var/cache/apt is used
-for regeneratable data and is where the package cache and downloaded .debs
-go. /etc/apt is the place where configuration should happen and
-/usr/lib/apt is the place where the apt and other packages can place
-binaries which can be used by the acquire system of APT.
-</sect>
-                                                                  <!-- }}} -->
-
-<chapt>Files
-<!-- Distribution Source List					       {{{ -->
-<!-- ===================================================================== -->
-<sect>Files and fragment directories in /etc/apt
-
-<p>
-All files in /etc/apt are used to modify specific aspects of APT. To enable
-other packages to ship needed configuration herself all these files have
-a fragment directory packages can place their files in instead of mangling
-with the main files. The main files are therefore considered to be only
-used by the user and not by a package. The documentation omits this directories
-most of the time to be easier readable, so every time the documentation includes
-a reference to a main file it really means the file or the fragment directories.
-
-</sect>
-
-<sect>Distribution Source list (sources.list)
-
-<p>
-The distribution source list is used to locate archives of the debian
-distribution. It is designed to support any number of active sources and to
-support a mix of source media. The file lists one source per line, with the 
-fastest source listed first. The format of each line is:
-
-<p>
-<var>type uri args</var>
-
-<p>
-The first item, <var>type</var>, indicates the format for the remainder 
-of the line. It is designed to indicate the structure of the distribution
-the line is talking about. Currently the only defined values are <em>deb</em>
-and <em>deb-src</em> which indicate a standard debian (source) archive with a
-dists directory. More about these types and the URI specification can be found
-in the sources.list manpage.
-
-<sect1>Hashing the URI
-<p>
-All permanent information acquired from any of the sources is stored in the
-lists directory. Thus, there must be a way to relate the filename in the
-lists directory to a line in the sourcelist. To simplify things this is
-done by quoting the URI and treating _'s as quoteable characters and
-converting / to _. The URI spec says this is done by converting a 
-sensitive character into %xx where xx is the hexadecimal representation 
-from the ASCII character set. Examples:
-
-<example>
-http://www.debian.org/archive/dists/stable/binary-i386/Packages 
-/var/lib/apt/lists/www.debian.org_archive_dists_stable_binary-i386_Packages
-
-cdrom:Debian 1.3/debian/Packages
-/var/lib/apt/info/Debian%201.3_debian_Packages
-</example>
-
-<p> 
-The other alternative that was considered was to use a deep directory 
-structure but this poses two problems, it makes it very difficult to prune
-directories back when sources are no longer used and complicates the handling
-of the partial directory. This gives a very simple way to deal with all
-of the situations that can arise. Also note that the same rules described in 
-the <em>Archive Directory</> section regarding the partial sub dir apply 
-here as well.
-</sect1>
-
-</sect>
-                                                                  <!-- }}} -->
-<!-- Extended Status						       {{{ -->
-<!-- ===================================================================== -->
-<sect>Extended States File (extended_states)
-
-<p>
-The extended_states file serves the same purpose as the normal dpkg status file
-(/var/lib/dpkg/status) except that it stores information unique to apt.
-This includes currently only the autoflag but is open to store more
-unique data that come up over time. It duplicates nothing from the normal
-dpkg status file.  Please see other APT documentation for a discussion
-of the exact internal behavior of these fields. The Package and the
-Architecture field are placed directly before the new fields to indicate
-which package they apply to. The new fields are as follows:
-
-<taglist>
-<tag>Auto-Installed<item>
-   The Auto flag can be 1 (Yes) or 0 (No) and controls whether the package
-   was automatical installed to satisfy a dependency or if the user requested
-   the installation
-</taglist>
-</sect>
-                                                                  <!-- }}} -->
-<!-- Binary Package Cache					       {{{ -->
-<!-- ===================================================================== -->
-<sect>Binary Package Cache (srcpkgcache.bin and pkgcache.bin)
-
-<p>
-Please see cache.sgml for a complete description of what this file is. The 
-cache file is updated whenever the contents of the lists directory changes.
-If the cache is erased, corrupted or of a non-matching version it will
-be automatically rebuilt by all of the tools that need it. 
-<em>srcpkgcache.bin</> contains a cache of all of the package files in the 
-source list. This allows regeneration of the cache when the status files 
-change to use a prebuilt version for greater speed.
-</sect>
-                                                                  <!-- }}} -->
-<!-- Downloads Directory					       {{{ -->
-<!-- ===================================================================== -->
-<sect>Downloads Directory (archives)
-
-<p>
-The archives directory is where all downloaded .deb archives go. When the
-file transfer is initiated the deb is placed in partial. Once the file
-is fully downloaded and its MD5 hash and size are verified it is moved
-from partial into archives/. Any files found in archives/ can be assumed 
-to be verified.
-
-<p>
-No directory structure is transferred from the receiving site and all .deb
-file names conform to debian conventions. No short (msdos) filename should
-be placed in archives. If the need arises .debs should be unpacked, scanned
-and renamed to their correct internal names. This is mostly to prevent
-file name conflicts but other programs may depend on this if convenient. 
-A conforming .deb is one of the form, name_version_arch.deb. Our archive
-scripts do not handle epochs, but they are necessary and should be re-inserted.
-If necessary _'s and :'s in the fields should be quoted using the % convention.
-It must be possible to extract all 3 fields by examining the file name.
-Downloaded .debs must be found in one of the package lists with an exact
-name + version match..
-</sect>
-                                                                  <!-- }}} -->
-<!-- The Methods Directory					       {{{ -->
-<!-- ===================================================================== -->
-<sect> The Methods Directory (/usr/lib/apt/methods)
-
-<p>
-The Methods directory is more fully described in the APT Methods interface
-document.
-</sect>
-                                                                  <!-- }}} -->
-<!-- The Configuration File					       {{{ -->
-<!-- ===================================================================== -->
-<sect> The Configuration File (/etc/apt/apt.conf)
-
-<p>
-The configuration file (and the associated fragments directory
-/etc/apt/apt.conf.d/) is described in the apt.conf manpage.
-</sect>
-                                                                  <!-- }}} -->
-<!-- The trusted.gpg File					       {{{ -->
-<!-- ===================================================================== -->
-<sect> The trusted.gpg File (/etc/apt/trusted.gpg)
-
-<p>
-The trusted.gpg file (and the files in the associated fragments directory
-/etc/apt/trusted.gpg.d/) is a binary file including the keyring used
-by apt to validate that the information (e.g. the Release file) it
-downloads are really from the distributor it clams to be and is
-unmodified and is therefore the last step in the chain of trust between
-the archive and the end user. This security system is described in the
-apt-secure manpage.
-</sect>
-                                                                  <!-- }}} -->
-<!-- The Release File						       {{{ -->
-<!-- ===================================================================== -->
-<sect> The Release File
-
-<p>
-This file plays an important role in how APT presents the archive to the 
-user. Its main purpose is to present a descriptive name for the source
-of each version of each package. It also is used to detect when new versions
-of debian are released. It augments the package file it is associated with 
-by providing meta information about the entire archive which the Packages
-file describes.
-
-<p>
-The full name of the distribution for presentation to the user is formed
-as 'label version archive', with a possible extended name being 
-'label version archive component'.
-
-<p>
-The file is formed as the package file (RFC-822) with the following tags
-defined:
-
-<taglist>
-<tag>Archive<item>
-This is the common name we give our archives, such as <em>stable</> or
-<em>unstable</>.
-
-<tag>Component<item>
-Refers to the sub-component of the archive, <em>main</>, <em>contrib</>
-etc. Component may be omitted if there are no components for this archive.
-
-<tag>Version<item>
-This is a version string with the same properties as in the Packages file.
-It represents the release level of the archive.
-
-<tag>Origin<item>
-This specifies who is providing this archive. In the case of Debian the
-string will read 'Debian'. Other providers may use their own string
-
-<tag>Label<item>
-This carries the encompassing name of the distribution. For Debian proper
-this field reads 'Debian'. For derived distributions it should contain their 
-proper name.
-
-<tag>Architecture<item>
-When the archive has packages for a single architecture then the Architecture
-is listed here. If a mixed set of systems are represented then this should
-contain the keyword <em>mixed</em>.
-
-<tag>NotAutomatic<item>
-A Yes/No flag indicating that the archive is extremely unstable and its
-version's should never be automatically selected. This is to be used by 
-experimental.
-
-<tag>Description<item>
-Description is used to describe the release. For instance experimental would
-contain a warning that the packages have problems.
-</taglist>
-
-<p>
-The location of the Release file in the archive is very important, it must 
-be located in the same location as the packages file so that it can be 
-located in all situations. The following is an example for the current stable
-release, 1.3.1r6 
-
-<example>
-Archive: stable
-Component: main
-Version: 1.3.1r6
-Origin: Debian
-Label: Debian
-Architecture: i386
-</example>
-
-This is an example of experimental,
-<example>
-Archive: experimental
-Version: 0
-Origin: Debian
-Label: Debian
-Architecture: mixed
-NotAutomatic: Yes
-</example>
-
-And unstable,
-<example>
-Archive: unstable
-Component: main
-Version: 2.1
-Origin: Debian
-Label: Debian
-Architecture: i386
-</example>
-
-</sect>
-                                                                  <!-- }}} -->
-
-</book>
diff --git a/doc/guide.dbk b/doc/guide.dbk
new file mode 100644
index 000000000..80937164e
--- /dev/null
+++ b/doc/guide.dbk
@@ -0,0 +1,561 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book 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;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
+]>
+
+<book lang="en">
+
+<title>APT User's Guide</title>
+
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Jason Gunthorpe</personname><email>jgg@debian.org</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
+
+<abstract>
+<para>
+This document provides an overview of how to use the the APT package manager.
+</para>
+</abstract>
+
+<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
+"APT" and this document are free software; you can redistribute them and/or
+modify them under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+</para>
+</legalnotice>
+
+<legalnotice>
+<para>
+For more details, on Debian systems, see the file
+/usr/share/common-licenses/GPL for the full license.
+</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="ch1"><title>General</title>
+<para>
+The APT package currently contains two sections, the APT
+<command>dselect</command> method and the <command>apt-get</command> command
+line user interface. Both provide a way to install and remove packages as well
+as download new packages from the Internet.
+</para>
+
+<section id="s1.1"><title>Anatomy of the Package System</title>
+<para>
+The Debian packaging system has a large amount of information associated with
+each package to help assure that it integrates cleanly and easily into the
+system. The most prominent of its features is the dependency system.
+</para>
+<para>
+The dependency system allows individual programs to make use of shared elements
+in the system such as libraries. It simplifies placing infrequently used
+portions of a program in separate packages to reduce the number of things the
+average user is required to install. Also, it allows for choices in mail
+transport agents, X servers and so on.
+</para>
+<para>
+The first step to understanding the dependency system is to grasp the concept
+of a simple dependency. The meaning of a simple dependency is that a package
+requires another package to be installed at the same time to work properly.
+</para>
+<para>
+For instance, mailcrypt is an emacs extension that aids in encrypting email
+with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a
+simple dependency on GPG. Also, because it is an emacs extension it has a
+simple dependency on emacs, without emacs it is completely useless.
+</para>
+<para>
+The other important dependency to understand is a conflicting dependency. It
+means that a package, when installed with another package, will not work and
+may possibly be extremely harmful to the system. As an example consider a mail
+transport agent such as sendmail, exim or qmail. It is not possible to have
+two mail transport agents installed because both need to listen to the network
+to receive mail. Attempting to install two will seriously damage the system so
+all mail transport agents have a conflicting dependency with all other mail
+transport agents.
+</para>
+<para>
+As an added complication there is the possibility for a package to pretend to
+be another package. Consider that exim and sendmail for many intents are
+identical, they both deliver mail and understand a common interface. Hence,
+the package system has a way for them to declare that they are both
+mail-transport-agents. So, exim and sendmail both declare that they provide a
+mail-transport-agent and other packages that need a mail transport agent depend
+on mail-transport-agent. This can add a great deal of confusion when trying to
+manually fix packages.
+</para>
+<para>
+At any given time a single dependency may be met by packages that are already
+installed or it may not be. APT attempts to help resolve dependency issues by
+providing a number of automatic algorithms that help in selecting packages for
+installation.
+</para>
+</section>
+
+</chapter>
+
+<chapter id="ch2"><title>apt-get</title>
+<para>
+<command>apt-get</command> provides a simple way to install packages from the
+command line. Unlike <command>dpkg</command>, <command>apt-get</command> does
+not understand .deb files, it works with the package's proper name and can only
+install .deb archives from a <emphasis>Source</emphasis>.
+</para>
+<para>
+The first <footnote><para> If you are using an http proxy server you must set
+the http_proxy environment variable first, see sources.list(5) </para>
+</footnote> thing that should be done before using <command>apt-get</command>
+is to fetch the package lists from the <emphasis>Sources</emphasis> so that it
+knows what packages are available. This is done with <literal>apt-get
+update</literal>. For instance,
+</para>
+<screen>
+# apt-get update
+Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages
+Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages
+Reading Package Lists... Done
+Building Dependency Tree... Done
+</screen>
+<para>
+Once updated there are several commands that can be used:
+</para>
+<variablelist>
+<varlistentry>
+<term>upgrade</term>
+<listitem>
+<para>
+Upgrade will attempt to gently upgrade the whole system. Upgrade will never
+install a new package or remove an existing package, nor will it ever upgrade a
+package that might cause some other package to break. This can be used daily
+to relatively safely upgrade the system. Upgrade will list all of the packages
+that it could not upgrade, this usually means that they depend on new packages
+or conflict with some other package. <command>dselect</command> or
+<literal>apt-get install</literal> can be used to force these packages to
+install.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>install</term>
+<listitem>
+<para>
+Install is used to install packages by name. The package is automatically
+fetched and installed. This can be useful if you already know the name of the
+package to install and do not want to go into a GUI to select it. Any number
+of packages may be passed to install, they will all be fetched. Install
+automatically attempts to resolve dependency problems with the listed packages
+and will print a summary and ask for confirmation if anything other than its
+arguments are changed.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>dist-upgrade</term>
+<listitem>
+<para>
+Dist-upgrade is a complete upgrader designed to simplify upgrading between
+releases of Debian. It uses a sophisticated algorithm to determine the best
+set of packages to install, upgrade and remove to get as much of the system to
+the newest release. In some situations it may be desired to use dist-upgrade
+rather than spend the time manually resolving dependencies in
+<command>dselect</command>. Once dist-upgrade has completed then
+<command>dselect</command> can be used to install any packages that may have
+been left out.
+</para>
+<para>
+It is important to closely look at what dist-upgrade is going to do, its
+decisions may sometimes be quite surprising.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+<para>
+<command>apt-get</command> has several command line options that are detailed
+in its man page,
+<citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</manvolnum></citerefentry>. The
+most useful option is <literal>-d</literal> 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
+<literal>-d</literal> is used the downloaded archives can be installed by
+simply running the command that caused them to be downloaded again without
+<literal>-d</literal>.
+</para>
+</chapter>
+
+<chapter id="ch3"><title>DSelect</title>
+<para>
+The APT <command>dselect</command> method provides the complete
+APT system with the <command>dselect</command> package selection
+GUI. <command>dselect</command> is used to select the packages to be
+installed or removed and APT actually installs them.
+</para>
+<para>
+To enable the APT method you need to select [A]ccess in
+<command>dselect</command> and then choose the APT method. You will be
+prompted for a set of <emphasis>Sources</emphasis> which are places to fetch
+archives from. These can be remote Internet sites, local Debian mirrors or
+CD-ROMs. Each source can provide a fragment of the total Debian archive, APT
+will automatically combine them to form a complete set of packages. If you
+have a CD-ROM then it is a good idea to specify it first and then specify a
+mirror so that you have access to the latest bug fixes. APT will automatically
+use packages on your CD-ROM before downloading from the Internet.
+</para>
+<screen>
+   Set up a list of distribution source locations
+
+ Please give the base URL of the debian distribution.
+ The access schemes I know about are: http file
+
+ For example:
+      file:/mnt/debian,
+      ftp://ftp.debian.org/debian,
+      http://ftp.de.debian.org/debian,
+
+
+ URL [http://llug.sep.bnl.gov/debian]:
+</screen>
+<para>
+The <emphasis>Sources</emphasis> setup starts by asking for the base of the
+Debian archive, defaulting to a HTTP mirror. Next it asks for the distribution
+to get.
+</para>
+<screen>
+ Please give the distribution tag to get or a path to the
+ package file ending in a /. The distribution
+ tags are typically something like: stable unstable testing non-US
+
+ Distribution [stable]:
+</screen>
+<para>
+The distribution refers to the Debian version in the archive,
+<emphasis>stable</emphasis> refers to the latest released version
+and <emphasis>unstable</emphasis> refers to the developmental
+version. <emphasis>non-US</emphasis> is only available on some mirrors
+and refers to packages that contain encryption technology or other
+things that cannot be exported from the United States. Importing these
+packages into the US is legal however.
+</para>
+<screen>
+ Please give the components to get
+ The components are typically something like: main contrib non-free
+
+ Components [main contrib non-free]:
+</screen>
+<para>
+The components list refers to the list of sub distributions to fetch. The
+distribution is split up based on software licenses, main being DFSG free
+packages while contrib and non-free contain things that have various
+restrictions placed on their use and distribution.
+</para>
+<para>
+Any number of sources can be added, the setup script will continue to prompt
+until you have specified all that you want.
+</para>
+<para>
+Before starting to use <command>dselect</command> it is necessary to update
+the available list by selecting [U]pdate from the menu. This is a superset of
+<literal>apt-get update</literal> that makes the fetched information available
+to <command>dselect</command>. [U]pdate must be performed even if
+<literal>apt-get update</literal> has been run before.
+</para>
+<para>
+You can then go on and make your selections using [S]elect and then perform
+the installation using [I]nstall. When using the APT method the [C]onfig and
+[R]emove commands have no meaning, the [I]nstall command performs both of
+them together.
+</para>
+<para>
+By default APT will automatically remove the package (.deb) files once they
+have been successfully installed. To change this behavior place
+<literal>Dselect::clean "prompt";</literal> in /etc/apt/apt.conf.
+</para>
+</chapter>
+
+<chapter id="ch4"><title>The Interface</title>
+<para>
+Both that APT <command>dselect</command> method and <command>apt-get</command>
+share the same interface. It is a simple system that generally tells you what
+it will do and then goes and does it. <footnote><para> The
+<command>dselect</command> method actually is a set of wrapper scripts to
+<command>apt-get</command>. The method actually provides more functionality
+than is present in <command>apt-get</command> alone. </para> </footnote> After
+printing out a summary of what will happen APT then will print out some
+informative status messages so that you can estimate how far along it is and
+how much is left to do.
+</para>
+
+<section id="s4.1"><title>Startup</title>
+<para>
+Before all operations except update, APT performs a number of actions
+to prepare its internal state. It also does some checks of the system's
+state. At any time these operations can be performed by running
+<literal>apt-get check</literal>.
+</para>
+<screen>
+# apt-get check
+Reading Package Lists... Done
+Building Dependency Tree... Done
+</screen>
+<para>
+The first thing it does is read all the package files into memory. APT uses a
+caching scheme so this operation will be faster the second time it is run. If
+some of the package files are not found then they will be ignored and a
+warning will be printed when apt-get exits.
+</para>
+<para>
+The final operation performs a detailed analysis of the system's
+dependencies. It checks every dependency of every installed or unpacked
+package and considers if it is OK. Should this find a problem then a report
+will be printed out and <command>apt-get</command> will refuse to run.
+</para>
+<screen>
+# apt-get check
+Reading Package Lists... Done
+Building Dependency Tree... Done
+You might want to run apt-get -f install' to correct these.
+Sorry, but the following packages have unmet dependencies:
+  9fonts: Depends: xlib6g but it is not installed
+  uucp: Depends: mailx but it is not installed
+  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed
+  adduser: Depends: perl-base but it is not installed
+  aumix: Depends: libgpmg1 but it is not installed
+  debiandoc-sgml: Depends: sgml-base but it is not installed
+  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed
+  cthugha: Depends: svgalibg1 but it is not installed
+           Depends: xlib6g (&gt;= 3.3-5) but it is not installed
+  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)
+</screen>
+<para>
+In this example the system has many problems, including a serious problem with
+libreadlineg2. For each package that has unmet dependencies a line is printed
+out indicating the package with the problem and the dependencies that are
+unmet. A short explanation of why the package has a dependency problem is also
+included.
+</para>
+<para>
+There are two ways a system can get into a broken state like this. The
+first is caused by <command>dpkg</command> missing some subtle relationships
+between packages when performing upgrades. <footnote><para> APT however
+considers all known dependencies and attempts to prevent broken
+packages </para> </footnote>. The second is if a package installation
+fails during an operation. In this situation a package may have been
+unpacked without its dependents being installed.
+</para>
+<para>
+The second situation is much less serious than the first because APT places
+certain constraints on the order that packages are installed. In both cases
+supplying the <literal>-f</literal> option to <command>apt-get</command>
+will cause APT to deduce a possible solution to the problem and then
+continue on. The APT <command>dselect</command> method always supplies
+the <literal>-f</literal> option to allow for easy continuation of failed
+maintainer scripts.
+</para>
+<para>
+However, if the <literal>-f</literal> option is used to correct a seriously
+broken system caused by the first case then it is possible that it will either
+fail immediately or the installation sequence will fail. In either case it is
+necessary to manually use dpkg (possibly with forcing options) to correct the
+situation enough to allow APT to proceed.
+</para>
+</section>
+
+<section id="s4.2"><title>The Status Report</title>
+<para>
+Before proceeding <command>apt-get</command> will present a report on what will
+happen. Generally the report reflects the type of operation being performed
+but there are several common elements. In all cases the lists reflect the
+final state of things, taking into account the <literal>-f</literal> option
+and any other relevant activities to the command being executed.
+</para>
+
+<section id="s4.2.1"><title>The Extra Package list</title>
+<screen>
+The following extra packages will be installed:
+  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl
+  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base
+  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy
+  squake pgp-i python-base debmake ldso perl libreadlineg2
+  ssh
+</screen>
+<para>
+The Extra Package list shows all of the packages that will be installed or
+upgraded in excess of the ones mentioned on the command line. It is only
+generated for an <literal>install</literal> command. The listed packages are
+often the result of an Auto Install.
+</para>
+</section>
+
+<section id="s4.2.2"><title>The Packages to Remove</title>
+<screen>
+The following packages will be REMOVED:
+  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix
+  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel
+  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid
+  nas xpilot xfig
+</screen>
+<para>
+The Packages to Remove list shows all of the packages that will be removed
+from the system. It can be shown for any of the operations and should be given
+a careful inspection to ensure nothing important is to be taken off. The
+<literal>-f</literal> option is especially good at generating packages to
+remove so extreme care should be used in that case. The list may contain
+packages that are going to be removed because they are only partially
+installed, possibly due to an aborted installation.
+</para>
+</section>
+
+<section id="s4.2.3"><title>The New Packages list</title>
+<screen>
+The following NEW packages will installed:
+  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base
+</screen>
+<para>
+The New Packages list is simply a reminder of what will happen. The packages
+listed are not presently installed in the system but will be when APT is done.
+</para>
+</section>
+
+<section id="s4.2.4"><title>The Kept Back list</title>
+<screen>
+The following packages have been kept back
+  compface man-db tetex-base msql libpaper svgalib1
+  gs snmp arena lynx xpat2 groff xscreensaver
+</screen>
+<para>
+Whenever the whole system is being upgraded there is the possibility that new
+versions of packages cannot be installed because they require new things or
+conflict with already installed things. In this case the package will appear
+in the Kept Back list. The best way to convince packages listed there to
+install is with <literal>apt-get install</literal> or by using
+<command>dselect</command> to resolve their problems.
+</para>
+</section>
+
+<section id="s4.2.5"><title>Held Packages warning</title>
+<screen>
+The following held packages will be changed:
+  cvs
+</screen>
+<para>
+Sometimes you can ask APT to install a package that is on hold, in such a case
+it prints out a warning that the held package is going to be changed. This
+should only happen during dist-upgrade or install.
+</para>
+</section>
+
+<section id="s4.2.6"><title>Final summary</title>
+<para>
+Finally, APT will print out a summary of all the changes that will occur.
+</para>
+<screen>
+206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.
+12 packages not fully installed or removed.
+Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.
+</screen>
+<para>
+The first line of the summary simply is a reduced version of all of the lists
+and includes the number of upgrades - that is packages already installed that
+have new versions available. The second line indicates the number of poorly
+configured packages, possibly the result of an aborted installation. The final
+line shows the space requirements that the installation needs. The first pair
+of numbers refer to the size of the archive files. The first number indicates
+the number of bytes that must be fetched from remote locations and the second
+indicates the total size of all the archives required. The next number
+indicates the size difference between the presently installed packages and the
+newly installed packages. It is roughly equivalent to the space required in
+/usr after everything is done. If a large number of packages are being removed
+then the value may indicate the amount of space that will be freed.
+</para>
+<para>
+Some other reports can be generated by using the -u option to show packages to
+upgrade, they are similar to the previous examples.
+</para>
+</section>
+
+</section>
+
+<section id="s4.3"><title>The Status Display</title>
+<para>
+During the download of archives and package files APT prints out a series of
+status messages.
+</para>
+<screen>
+# apt-get update
+Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages
+Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages
+Hit http://llug.sep.bnl.gov/debian/ testing/main Packages
+Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages
+Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages
+11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s
+</screen>
+<para>
+The lines starting with <emphasis>Get</emphasis> are printed out when APT
+begins to fetch a file while the last line indicates the progress of the
+download. The first percent value on the progress line indicates the total
+percent done of all files. Unfortunately since the size of the Package files
+is unknown <literal>apt-get update</literal> estimates the percent done which
+causes some inaccuracies.
+</para>
+<para>
+The next section of the status line is repeated once for each download
+thread and indicates the operation being performed and some useful
+information about what is happening. Sometimes this section will simply
+read <emphasis>Forking</emphasis> which means the OS is loading the download
+module. The first word after the [ is the fetch number as shown on the
+history lines. The next word is the short form name of the object being
+downloaded. For archives it will contain the name of the package that is
+being fetched.
+</para>
+<para>
+Inside of the single quote is an informative string indicating the progress of
+the negotiation phase of the download. Typically it progresses from
+<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to
+<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final
+value is the number of bytes downloaded from the remote site. Once the
+download begins this is represented as <literal>102/10.2k</literal> indicating
+that 102 bytes have been fetched and 10.2 kilobytes is expected. The total
+size is always shown in 4 figure notation to preserve space. After the size
+display is a percent meter for the file itself. The second last element is the
+instantaneous average speed. This values is updated every 5 seconds and
+reflects the rate of data transfer for that period. Finally is shown the
+estimated transfer time. This is updated regularly and reflects the time to
+complete everything at the shown transfer rate.
+</para>
+<para>
+The status display updates every half second to provide a constant feedback on
+the download progress while the Get lines scroll back whenever a new file is
+started. Since the status display is constantly updated it is unsuitable for
+logging to a file, use the <literal>-q</literal> option to remove the status
+display.
+</para>
+</section>
+
+<section id="s4.4"><title>Dpkg</title>
+<para>
+APT uses <command>dpkg</command> for installing the archives and will
+switch over to the <command>dpkg</command> interface once downloading is
+completed. <command>dpkg</command> will also ask a number of questions as
+it processes the packages and the packages themselves may also ask several
+questions. Before each question there is usually a description of what it
+is asking and the questions are too varied to discuss completely here.
+</para>
+</section>
+
+</chapter>
+
+</book>
diff --git a/doc/guide.sgml b/doc/guide.sgml
deleted file mode 100644
index 747c5718c..000000000
--- a/doc/guide.sgml
+++ /dev/null
@@ -1,547 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
-<title>APT User's Guide</title>
-
-<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $</version>
-
-<abstract>
-This document provides an overview of how to use the the APT package manager.
-</abstract>
-
-<copyright>
-Copyright &copy; Jason Gunthorpe, 1998.
-<p>
-"APT" and this document are free software; you can redistribute them and/or
-modify them under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-<p>
-For more details, on Debian systems, see the file
-/usr/share/common-licenses/GPL for the full license.
-</copyright>
-
-<toc sect>
-
-<!-- General		                                               {{{ -->
-<!-- ===================================================================== -->
-<chapt>General
-
-<p>
-The APT package currently contains two sections, the APT <prgn>dselect</>
-method and the <prgn>apt-get</> command line user interface. Both provide 
-a way to install and remove packages as well as download new packages from 
-the Internet. 
-
-<sect>Anatomy of the Package System
-<p>
-The Debian packaging system has a large amount of information associated with
-each package to help assure that it integrates cleanly and easily into
-the system. The most prominent of its features is the dependency system.
-
-<p>
-The dependency system allows individual programs to make use of shared 
-elements in the system such as libraries. It simplifies placing infrequently 
-used portions of a program in separate packages to reduce the
-number of things the average user is required to install. Also, it allows
-for choices in mail transport agents, X servers and 
-so on.
-
-<p>
-The first step to understanding the dependency system is to grasp the concept
-of a simple dependency. The meaning of a simple dependency is that a package
-requires another package to be installed at the same time to work properly.
-
-<p>
-For instance, mailcrypt is an emacs extension that aids in encrypting email
-with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a
-simple dependency on GPG. Also, because it is an emacs extension it has a 
-simple dependency on emacs, without emacs it is completely useless.
-
-<p>
-The other important dependency to understand is a conflicting dependency. It
-means that a package, when installed with another package, will not work and
-may possibly be extremely harmful to the system. As an example consider a
-mail transport agent such as sendmail, exim or qmail. It is not possible
-to have two mail transport agents installed because both need to listen to
-the network to receive mail. Attempting to install two will seriously
-damage the system so all mail transport agents have a conflicting dependency
-with all other mail transport agents.
-
-<p>
-As an added complication there is the possibility for a package to pretend
-to be another package. Consider that exim and sendmail for many intents are
-identical, they both deliver mail and understand a common interface. Hence,
-the package system has a way for them to declare that they are both
-mail-transport-agents. So, exim and sendmail both declare that they provide a
-mail-transport-agent and other packages that need a mail transport agent
-depend on mail-transport-agent. This can add a great deal of confusion when 
-trying to manually fix packages.
-
-<p>
-At any given time a single dependency may be met by packages that are already
-installed or it may not be. APT attempts to help resolve dependency issues
-by providing a number of automatic algorithms that help in selecting packages
-for installation.
-</sect>
-
-</chapt>
-                                                                  <!-- }}} -->
-<!-- apt-get		                                               {{{ -->
-<!-- ===================================================================== -->
-<chapt>apt-get
-
-<p>
-<prgn>apt-get</> provides a simple way to install packages from the command 
-line. Unlike <prgn>dpkg</>, <prgn>apt-get</> does not understand .deb files, 
-it works with the package's proper name and can only install .deb archives from 
-a <em>Source</>.
-
-<p>
-The first <footnote>If you are using an http proxy server you must set the
-http_proxy environment variable first, see sources.list(5)</footnote> thing that 
-should be done before using <prgn>apt-get</> is to fetch the package lists
-from the <em>Sources</> so that it knows what packages are 
-available. This is done with <tt>apt-get update</>. For instance,
-
-<p>
-<example>
-# apt-get update
-Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages
-Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages
-Reading Package Lists... Done
-Building Dependency Tree... Done
-</example>
-
-<p>
-Once updated there are several commands that can be used:
-<taglist>
-<tag>upgrade<item>
-Upgrade will attempt to gently upgrade the whole system. Upgrade will
-never install a new package or remove an existing package, nor will it
-ever upgrade a package that might cause some other package to break.
-This can be used daily to relatively safely upgrade the system. Upgrade
-will list all of the packages that it could not upgrade, this usually
-means that they depend on new packages or conflict with some other package.
-<prgn>dselect</> or <tt>apt-get install</> can be used to force these
-packages to install.
-
-<tag>install<item>
-Install is used to install packages by name. The package is 
-automatically fetched and installed. This can be useful if you already
-know the name of the package to install and do not want to go into a GUI
-to select it. Any number of packages may be passed to install, they will
-all be fetched. Install automatically attempts to resolve dependency problems
-with the listed packages and will print a summary and ask for confirmation
-if anything other than its arguments are changed.
-
-<tag>dist-upgrade<item>
-Dist-upgrade is a complete upgrader designed to simplify upgrading between
-releases of Debian. It uses a sophisticated algorithm to determine the best
-set of packages to install, upgrade and remove to get as much of the system
-to the newest release. In some situations it may be desired to use dist-upgrade
-rather than spend the time manually resolving dependencies in <prgn>dselect</>.
-Once dist-upgrade has completed then <prgn>dselect</> can be used to install
-any packages that may have been left out.
-
-<p>
-It is important to closely look at what dist-upgrade is going to do, its
-decisions may sometimes be quite surprising.
-</taglist>
-
-<p>
-<prgn>apt-get</> has several command line options that are detailed in its
-man page, <manref name="apt-get" section="8">. The most useful option is 
-<tt>-d</> 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</> is used the downloaded
-archives can be installed by simply running the command that caused them to
-be downloaded again without <tt>-d</>.
-
-</chapt>
-                                                                  <!-- }}} -->
-<!-- DSelect		                                               {{{ -->
-<!-- ===================================================================== -->
-<chapt>DSelect
-<p>
-The APT <prgn>dselect</> method provides the complete APT system with 
-the <prgn>dselect</> package selection GUI. <prgn>dselect</> is used to
-select the packages to be installed or removed and APT actually installs them.
-
-<p>
-To enable the APT method you need to select [A]ccess in <prgn>dselect</> 
-and then choose the APT method. You will be prompted for a set of 
-<em>Sources</> which are places to fetch archives from. These can be remote
-Internet sites, local Debian mirrors or CD-ROMs. Each source can provide
-a fragment of the total Debian archive, APT will automatically combine them
-to form a complete set of packages. If you have a CD-ROM then it is a good idea
-to specify it first and then specify a mirror so that you have access to
-the latest bug fixes. APT will automatically use packages on your CD-ROM before
-downloading from the Internet.
-
-<p>
-<example>
-   Set up a list of distribution source locations
-	 
- Please give the base URL of the debian distribution.
- The access schemes I know about are: http file
-	   
- For example:
-      file:/mnt/debian,
-      ftp://ftp.debian.org/debian,
-      http://ftp.de.debian.org/debian,
-      
-      
- URL [http://llug.sep.bnl.gov/debian]: 
-</example>
-
-<p>
-The <em>Sources</> setup starts by asking for the base of the Debian
-archive, defaulting to a HTTP mirror. Next it asks for the distribution to
-get.
-
-<p>
-<example>
- Please give the distribution tag to get or a path to the
- package file ending in a /. The distribution
- tags are typically something like: stable unstable testing non-US
-   
- Distribution [stable]: 
-</example>
-
-<p>
-The distribution refers to the Debian version in the archive, <em>stable</>
-refers to the latest released version and <em>unstable</> refers to the
-developmental version. <em>non-US</> is only available on some mirrors and
-refers to packages that contain encryption technology or other things that
-cannot be exported from the United States. Importing these packages into the
-US is legal however. 
-
-<p>
-<example>
- Please give the components to get
- The components are typically something like: main contrib non-free
-  
- Components [main contrib non-free]:
-</example>
-
-<p>
-The components list refers to the list of sub distributions to fetch. The
-distribution is split up based on software licenses, main being DFSG free
-packages while contrib and non-free contain things that have various 
-restrictions placed on their use and distribution.
-
-<p>
-Any number of sources can be added, the setup script will continue to
-prompt until you have specified all that you want.
-
-<p>
-Before starting to use <prgn>dselect</> it is necessary to update the 
-available list by selecting [U]pdate from the menu. This is a superset of 
-<tt>apt-get update</> that makes the fetched information available to
-<prgn>dselect</>. [U]pdate must be performed even if <tt>apt-get update</>
-has been run before.
-
-<p>
-You can then go on and make your selections using [S]elect and then 
-perform the installation using [I]nstall. When using the APT method
-the [C]onfig and [R]emove commands have no meaning, the [I]nstall command
-performs both of them together. 
-
-<p>
-By default APT will automatically remove the package (.deb) files once they have been
-successfully installed. To change this behavior place <tt>Dselect::clean 
-"prompt";</> in /etc/apt/apt.conf.
-
-</chapt>
-                                                                  <!-- }}} -->
-<!-- The Interfaces						       {{{ -->
-<!-- ===================================================================== -->
-<chapt>The Interface
-
-<p>
-Both that APT <prgn>dselect</> method and <prgn>apt-get</> share the same
-interface. It is a simple system that generally tells you what it will do
-and then goes and does it. 
-<footnote>
-The <prgn>dselect</> method actually is a set of wrapper scripts
-to <prgn>apt-get</>. The method actually provides more functionality than
-is present in <prgn>apt-get</> alone.
-</footnote>
-After printing out a summary of what will happen APT then will print out some
-informative status messages so that you can estimate how far along it is and
-how much is left to do.
-
-<!-- ===================================================================== -->
-<sect>Startup
-
-<p>
-Before all operations except update, APT performs a number of actions to
-prepare its internal state. It also does some checks of the system's state.
-At any time these operations can be performed by running <tt>apt-get check</>.
-<p>
-<example>
-# apt-get check
-Reading Package Lists... Done
-Building Dependency Tree... Done
-</example>
-
-<p>
-The first thing it does is read all the package files into memory. APT
-uses a caching scheme so this operation will be faster the second time it
-is run. If some of the package files are not found then they will be ignored
-and a warning will be printed when apt-get exits. 
-
-<p>
-The final operation performs a detailed analysis of the system's dependencies.
-It checks every dependency of every installed or unpacked package and considers
-if it is OK. Should this find a problem then a report will be printed out and
-<prgn>apt-get</> will refuse to run.
-
-<p>
-<example>
-# apt-get check
-Reading Package Lists... Done
-Building Dependency Tree... Done
-You might want to run apt-get -f install' to correct these.
-Sorry, but the following packages have unmet dependencies:
-  9fonts: Depends: xlib6g but it is not installed
-  uucp: Depends: mailx but it is not installed
-  blast: Depends: xlib6g (>= 3.3-5) but it is not installed
-  adduser: Depends: perl-base but it is not installed
-  aumix: Depends: libgpmg1 but it is not installed
-  debiandoc-sgml: Depends: sgml-base but it is not installed
-  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed
-  cthugha: Depends: svgalibg1 but it is not installed
-           Depends: xlib6g (>= 3.3-5) but it is not installed
-  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)
-</example>
-
-<p>
-In this example the system has many problems, including a serious problem
-with libreadlineg2. For each package that has unmet dependencies a line
-is printed out indicating the package with the problem and the dependencies
-that are unmet. A short explanation of why the package has a dependency
-problem is also included.
-
-<p>
-There are two ways a system can get into a broken state like this. The
-first is caused by <prgn>dpkg</> missing some subtle relationships between 
-packages when performing upgrades. <footnote>APT however considers all known 
-dependencies and attempts to prevent broken packages</footnote>. The second is 
-if a package installation fails during an operation. In this situation a 
-package may have been unpacked without its dependents being installed.
-
-<p>
-The second situation is much less serious than the first because APT places
-certain constraints on the order that packages are installed. In both cases
-supplying the <tt>-f</> option to <prgn>apt-get</> will cause APT to deduce a
-possible solution to the problem and then continue on. The APT <prgn>dselect</> 
-method always supplies the <tt>-f</> option to allow for easy continuation
-of failed maintainer scripts.
-
-<p>
-However, if the <tt>-f</> option is used to correct a seriously broken system
-caused by the first case then it is possible that it will either fail 
-immediately or the installation sequence will fail. In either case it is
-necessary to manually use dpkg (possibly with forcing options) to correct
-the situation enough to allow APT to proceed.
-</sect>
-
-<!-- ===================================================================== -->
-<sect>The Status Report
-
-<p>
-Before proceeding <prgn>apt-get</> will present a report on what will happen.
-Generally the report reflects the type of operation being performed but there
-are several common elements. In all cases the lists reflect the final state
-of things, taking into account the <tt>-f</> option and any other relevant
-activities to the command being executed.
-
-<sect1>The Extra Package list
-<p>
-<example>
-The following extra packages will be installed:
-  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl
-  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base
-  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy
-  squake pgp-i python-base debmake ldso perl libreadlineg2
-  ssh
-</example>
-
-<p>
-The Extra Package list shows all of the packages that will be installed 
-or upgraded in excess of the ones mentioned on the command line. It is
-only generated for an <tt>install</> command. The listed packages are
-often the result of an Auto Install.
-</sect1>
-
-<sect1>The Packages to Remove
-<p>
-<example>
-The following packages will be REMOVED:
-  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix
-  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel
-  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid
-  nas xpilot xfig 
-</example>
-
-<p>
-The Packages to Remove list shows all of the packages that will be
-removed from the system. It can be shown for any of the operations and 
-should be given a careful inspection to ensure nothing important is to 
-be taken off. The <tt>-f</> option is especially good at generating packages
-to remove so extreme care should be used in that case. The list may contain
-packages that are going to be removed because they are only 
-partially installed, possibly due to an aborted installation.
-</sect1>
-
-<sect1>The New Packages list
-<p>
-<example>
-The following NEW packages will installed:
-  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base
-</example>
-
-<p>
-The New Packages list is simply a reminder of what will happen. The packages
-listed are not presently installed in the system but will be when APT is done.
-</sect1>
-
-<sect1>The Kept Back list
-<p>
-<example>
-The following packages have been kept back
-  compface man-db tetex-base msql libpaper svgalib1
-  gs snmp arena lynx xpat2 groff xscreensaver
-</example>
-
-<p>
-Whenever the whole system is being upgraded there is the possibility that
-new versions of packages cannot be installed because they require new things
-or conflict with already installed things. In this case the package will 
-appear in the Kept Back list. The best way to convince packages listed
-there to install is with <tt>apt-get install</> or by using <prgn>dselect</>
-to resolve their problems.
-</sect1>
-
-<sect1>Held Packages warning
-<p>
-<example>
-The following held packages will be changed:
-  cvs 
-</example>
-
-<p>
-Sometimes you can ask APT to install a package that is on hold, in such a 
-case it prints out a warning that the held package is going to be
-changed. This should only happen during dist-upgrade or install.
-</sect1>
-
-<sect1>Final summary
-<p>
-Finally, APT will print out a summary of all the changes that will occur.
-
-<p>
-<example>
-206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.
-12 packages not fully installed or removed.
-Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used. 
-</example>
-
-<p>
-The first line of the summary simply is a reduced version of all of the
-lists and includes the number of upgrades - that is packages already 
-installed that have new versions available. The second line indicates the
-number of poorly configured packages, possibly the result of an aborted
-installation. The final line shows the space requirements that the
-installation needs. The first pair of numbers refer to the size of
-the archive files. The first number indicates the number of bytes that
-must be fetched from remote locations and the second indicates the
-total size of all the archives required. The next number indicates the
-size difference between the presently installed packages and the newly
-installed packages. It is roughly equivalent to the space required in 
-/usr after everything is done. If a large number of packages are being
-removed then the value may indicate the amount of space that will be
-freed.
-
-<p>
-Some other reports can be generated by using the -u option to show packages
-to upgrade, they are similar to the previous examples.
-</sect>
-
-<!-- ===================================================================== -->
-<sect>The Status Display
-<p>
-During the download of archives and package files APT prints out a series of
-status messages.
-
-<p>
-<example>
-# apt-get update
-Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages
-Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages
-Hit http://llug.sep.bnl.gov/debian/ testing/main Packages
-Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages
-Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages
-11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s
-</example>
-
-<p>
-The lines starting with <em>Get</> are printed out when APT begins to fetch 
-a file while the last line indicates the progress of the download. The first 
-percent  value on the progress line indicates the total percent done of all 
-files. Unfortunately since the size of the Package files is unknown 
-<tt>apt-get update</> estimates the percent done which causes some 
-inaccuracies.
-
-<p>
-The next section of the status line is repeated once for each download thread
-and indicates the operation being performed and some useful information
-about what is happening. Sometimes this section will simply read <em>Forking</>
-which means the OS is loading the download module. The first word after the [
-is the fetch number as shown on the history lines. The next word
-is the short form name of the object being downloaded. For archives it will
-contain the name of the package that is being fetched.
-
-<p>
-Inside of the single quote is an informative string indicating the progress
-of the negotiation phase of the download. Typically it progresses from 
-<em>Connecting</> to <em>Waiting for file</> to <em>Downloading</> or
-<em>Resuming</>. The final value is the number of bytes downloaded from the
-remote site. Once the download begins this is represented as <tt>102/10.2k</>
-indicating that 102 bytes have been fetched and 10.2 kilobytes is expected.
-The total size is always shown in 4 figure notation to preserve space. After
-the size display is a percent meter for the file itself.
-The second last element is the instantaneous average speed. This values is 
-updated every 5 seconds and reflects the rate of data transfer for that 
-period. Finally is shown the estimated transfer time. This is updated
-regularly and reflects the time to complete everything at the shown 
-transfer rate.
-
-<p> 
-The status display updates every half second to provide a constant feedback 
-on the download progress while the Get lines scroll back whenever a new
-file is started. Since the status display is constantly updated it is
-unsuitable for logging to a file, use the <tt>-q</> option to remove the
-status display.
-</sect>
-
-<!-- ===================================================================== -->
-<sect>Dpkg
-
-<p>
-APT uses <prgn>dpkg</> for installing the archives and will switch
-over to the <prgn>dpkg</> interface once downloading is completed.
-<prgn>dpkg</> will also ask a number of questions as it processes the packages
-and the packages themselves may also ask several questions. Before each 
-question there is usually a description of what it is asking and the
-questions are too varied to discuss completely here.
-</sect>
-
-</chapt>
-                                                                  <!-- }}} -->
-
-</book>
diff --git a/doc/makefile b/doc/makefile
index 3939c749f..1c076d5be 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -5,12 +5,12 @@ SUBDIR=doc
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
-# Debian Doc SGML Documents
-SOURCE = $(wildcard *.sgml)
-DEBIANDOC_HTML_OPTIONS=-l en.UTF-8
-include $(DEBIANDOC_H)
+# DocBook XML Documents
+SOURCE = $(wildcard *.dbk)
+LC = en
+include $(DOCBOOK_H)
 
-doc: manpages debiandoc
+doc: manpages docbook
 
 examples/sources.list: ../vendor/current/sources.list
 	ln -sf $(shell readlink -f $^) $@
@@ -24,12 +24,12 @@ TO = $(DOC)
 TARGET = binary
 include $(COPY_H)
 
-.PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs debiandoc/subdirs all binary doc stats
+.PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs docbook/subdirs all binary doc stats
 
 clean: clean/subdirs clean/examples
 veryclean: veryclean/subdirs clean/examples
 manpages: apt-vendor.ent manpages/subdirs
-debiandoc: debiandoc/subdirs
+docbook: apt-vendor.ent docbook/subdirs
 
 DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
 DOCDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO))
@@ -39,7 +39,7 @@ $(DOCDIRLIST) :: %/makefile : lang.makefile
 	test -d $(dir $@) || mkdir $(dir $@)
 	sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@
 
-debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs:
+docbook/subdirs manpages/subdirs clean/subdirs veryclean/subdirs:
 	for dir in en $(dir $(DOCDIRLIST)); do \
 		$(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \
 	done
@@ -53,11 +53,11 @@ stats:
 
 ifdef PO4A
 MANPAGEPOLIST = $(addprefix manpages-translation-,$(DOCUMENTATIONPO))
-DEBIANDOCPOLIST = $(addprefix debiandoc-translation-,$(DOCUMENTATIONPO))
+DOCBOOKPOLIST = $(addprefix docbook-translation-,$(DOCUMENTATIONPO))
 
-.PHONY: update-po po4a $(MANPAGEPOLIST) $(DEBIANDOCPOLIST) $(DOCDIRLIST)
+.PHONY: update-po po4a $(MANPAGEPOLIST) $(DOCBOOKPOLIST) $(DOCDIRLIST)
 
-po4a: manpages/subdirs debiandoc/subdirs
+po4a: manpages/subdirs docbook/subdirs
 
 update-po:
 	po4a --previous --no-backups --force --no-translations \
@@ -78,10 +78,10 @@ $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
 		--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
 		--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 
-debiandoc/subdirs: $(DEBIANDOCPOLIST)
-$(DEBIANDOCPOLIST) :: debiandoc-translation-% : %/makefile po4a.conf
+docbook/subdirs: $(DOCBOOKPOLIST)
+$(DOCBOOKPOLIST) :: docbook-translation-% : %/makefile po4a.conf
 	po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
-		$(patsubst %,--translate-only $(dir $<)%,$(patsubst %.sgml,%.$(subst /,,$(dir $<)).sgml,$(wildcard *.sgml))) \
+		$(patsubst %,--translate-only $(dir $<)%,$(patsubst %.dbk,%.$(subst /,,$(dir $<)).dbk,$(wildcard *.dbk))) \
 		--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
 		--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 endif
@@ -101,5 +101,5 @@ $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
 	$(DOXYGEN) $(BUILD)/doc/Doxyfile
 	touch $(BUILD)/doc/doxygen-stamp
 
-debiandoc: $(BUILD)/doc/doxygen-stamp
+docbook: $(BUILD)/doc/doxygen-stamp
 endif
diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl
index 5cb6a58c2..a780bad13 100644
--- a/doc/manpage-style.xsl
+++ b/doc/manpage-style.xsl
@@ -5,7 +5,6 @@
 <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
 
 <xsl:param name="man.output.encoding" select="'UTF-8'" />
-<!-- LANGUAGE -->
 
 <xsl:template match="email">&lt;<xsl:apply-templates/>&gt;</xsl:template>
 
diff --git a/doc/method.dbk b/doc/method.dbk
new file mode 100644
index 000000000..09ef63e8c
--- /dev/null
+++ b/doc/method.dbk
@@ -0,0 +1,713 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book 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;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
+]>
+
+<book lang="en">
+
+<title>APT Method Interface</title>
+
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Jason Gunthorpe</personname><email>jgg@debian.org</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
+
+<abstract>
+<para>
+This document describes the interface that APT uses to the archive access
+methods.
+</para>
+</abstract>
+
+<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
+"APT" and this document are free software; you can redistribute them and/or
+modify them under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+</para>
+<para>
+For more details, on Debian systems, see the file
+/usr/share/common-licenses/GPL for the full license.
+</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="ch1"><title>Introduction</title>
+
+<section id="s1.1"><title>General</title>
+<para>
+The APT method interface allows APT to acquire archive files (.deb), index
+files (Packages, Release, Mirrors) and source files (.tar.gz, .diff). It is a
+general, extensible system designed to satisfy all of these requirements:
+</para>
+<orderedlist numeration="arabic">
+<listitem>
+<para>
+Remote methods that download files from a distant site
+</para>
+</listitem>
+<listitem>
+<para>
+Resume of aborted downloads
+</para>
+</listitem>
+<listitem>
+<para>
+Progress reporting
+</para>
+</listitem>
+<listitem>
+<para>
+If-Modified-Since (IMS) checking for index files
+</para>
+</listitem>
+<listitem>
+<para>
+In-Line MD5 generation
+</para>
+</listitem>
+<listitem>
+<para>
+No-copy in-filesystem methods
+</para>
+</listitem>
+<listitem>
+<para>
+Multi-media methods (like CD's)
+</para>
+</listitem>
+<listitem>
+<para>
+Dynamic source selection for failure recovery
+</para>
+</listitem>
+<listitem>
+<para>
+User interaction for user/password requests and media swaps
+</para>
+</listitem>
+<listitem>
+<para>
+Global configuration
+</para>
+</listitem>
+</orderedlist>
+<para>
+Initial releases of APT (0.1.x) used a completely different method interface
+that only supported the first 6 items. This new interface deals with the
+remainder.
+</para>
+</section>
+
+<section id="s1.2"><title>Terms</title>
+<para>
+Several terms are used through out the document, they have specific meanings
+which may not be immediately evident. To clarify they are summarized here.
+</para>
+<variablelist>
+<varlistentry>
+<term>source</term>
+<listitem>
+<para>
+Refers to an item in source list. More specifically it is the broken down
+item, that is each source maps to exactly one index file. Archive sources map
+to Package files and Source Code sources map to Source files.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>archive file</term>
+<listitem>
+<para>
+Refers to a binary package archive (.deb, .rpm, etc).
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>source file</term>
+<listitem>
+<para>
+Refers to one of the files making up the source code of a package. In debian
+it is one of .diff.gz, .dsc. or .tar.gz.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>URI</term>
+<listitem>
+<para>
+Universal Resource Identifier (URI) is a super-set of the familiar URL
+syntax used by web browsers. It consists of an access specification
+followed by a specific location in that access space. The form is
+&lt;access&gt;:&lt;location&gt;. Network addresses are given with the form
+&lt;access&gt;://[&lt;user&gt;[:&lt;pas&gt;]@]hostname[:port]/&lt;location&gt;.
+Some examples:
+</para>
+<screen>
+file:/var/mirrors/debian/
+ftp://ftp.debian.org/debian
+ftp://jgg:MooCow@localhost:21/debian
+nfs://bigred/var/mirrors/debian
+rsync://debian.midco.net/debian
+cdrom:Debian 2.0r1 Disk 1/
+</screen>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>method</term>
+<listitem>
+<para>
+There is a one to one mapping of URI access specifiers to methods. A method is
+a program that knows how to handle a URI access type and operates according to
+the specifications in this file.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>method instance</term>
+<listitem>
+<para>
+A specific running method. There can be more than one instance of each method
+as APT is capable of concurrent method handling.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>message</term>
+<listitem>
+<para>
+A series of lines terminated by a blank line sent down one of the communication
+lines. The first line should have the form xxx TAG where xxx are digits
+forming the status code and TAG is an informational string
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>acquire</term>
+<listitem>
+<para>
+The act of bring a URI into the local pathname space. This may simply be
+verifying the existence of the URI or actually downloading it from a remote
+site.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</section>
+
+</chapter>
+
+<chapter id="ch2"><title>Specification</title>
+
+<section id="s2.1"><title>Overview</title>
+<para>
+All methods operate as a sub process of a main controlling parent. 3 FD's are
+opened for use by the method allowing two way communication and emergency error
+reporting. The FD's correspond to the well known unix FD's, stdin, stdout and
+stderr.
+</para>
+<para>
+Through operation of the method communication is done via http style plain
+text. Specifically RFC-822 (like the Package file) fields are used to describe
+items and a numeric-like header is used to indicate what is happening. Each of
+these distinct communication messages should be sent quickly and without pause.
+</para>
+<para>
+In some instances APT may pre-invoke a method to allow things like file URI's
+to determine how many files are available locally.
+</para>
+</section>
+
+<section id="s2.2"><title>Message Overview</title>
+<para>
+The first line of each message is called the message header. The first 3
+digits (called the Status Code) have the usual meaning found in the http
+protocol. 1xx is informational, 2xx is successful and 4xx is failure. The 6xx
+series is used to specify things sent to the method. After the status code is
+an informational string provided for visual debugging.
+</para>
+<itemizedlist>
+<listitem>
+<para>
+100 Capabilities - Method capabilities
+</para>
+</listitem>
+<listitem>
+<para>
+101 Log - General Logging
+</para>
+</listitem>
+<listitem>
+<para>
+102 Status - Inter-URI status reporting (login progress)
+</para>
+</listitem>
+<listitem>
+<para>
+200 URI Start - URI is starting acquire
+</para>
+</listitem>
+<listitem>
+<para>
+201 URI Done - URI is finished acquire
+</para>
+</listitem>
+<listitem>
+<para>
+400 URI Failure - URI has failed to acquire
+</para>
+</listitem>
+<listitem>
+<para>
+401 General Failure - Method did not like something sent to it
+</para>
+</listitem>
+<listitem>
+<para>
+402 Authorization Required - Method requires authorization to access the URI.
+Authorization is User/Pass
+</para>
+</listitem>
+<listitem>
+<para>
+403 Media Failure - Method requires a media change
+</para>
+</listitem>
+<listitem>
+<para>
+600 URI Acquire - Request a URI be acquired
+</para>
+</listitem>
+<listitem>
+<para>
+601 Configuration - Sends the configuration space
+</para>
+</listitem>
+<listitem>
+<para>
+602 Authorization Credentials - Response to the 402 message
+</para>
+</listitem>
+<listitem>
+<para>
+603 Media Changed - Response to the 403 message
+</para>
+</listitem>
+</itemizedlist>
+<para>
+Only the 6xx series of status codes is sent TO the method. Furthermore the
+method may not emit status codes in the 6xx range. The Codes 402 and 403
+require that the method continue reading all other 6xx codes until the proper
+602/603 code is received. This means the method must be capable of handling an
+unlimited number of 600 messages.
+</para>
+<para>
+The flow of messages starts with the method sending out a <emphasis>100
+Capabilities</emphasis> and APT sending out a <emphasis>601
+Configuration</emphasis>. After that APT begins sending <emphasis>600 URI
+Acquire</emphasis> and the method sends out <emphasis>200 URI Start</emphasis>,
+<emphasis>201 URI Done</emphasis> or <emphasis>400 URI Failure</emphasis>. No
+synchronization is performed, it is expected that APT will send <emphasis>600
+URI Acquire</emphasis> messages at -any- time and that the method should queue
+the messages. This allows methods like http to pipeline requests to the remote
+server. It should be noted however that APT will buffer messages so it is not
+necessary for the method to be constantly ready to receive them.
+</para>
+</section>
+
+<section id="s2.3"><title>Header Fields</title>
+<para>
+The following is a short index of the header fields that are supported
+</para>
+<variablelist>
+<varlistentry>
+<term>URI</term>
+<listitem>
+<para>
+URI being described by the message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Filename</term>
+<listitem>
+<para>
+Location in the filesystem
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Last-Modified</term>
+<listitem>
+<para>
+A time stamp in RFC1123 notation for use by IMS checks
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>IMS-Hit</term>
+<listitem>
+<para>
+The already existing item is valid
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Size</term>
+<listitem>
+<para>
+Size of the file in bytes
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Resume-Point</term>
+<listitem>
+<para>
+Location that transfer was started
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>MD5-Hash</term>
+<listitem>
+<para>
+Computed MD5 hash for the file
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Message</term>
+<listitem>
+<para>
+String indicating some displayable message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Media</term>
+<listitem>
+<para>
+String indicating the media name required
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Site</term>
+<listitem>
+<para>
+String indicating the site authorization is required for
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>User</term>
+<listitem>
+<para>
+Username for authorization
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Password</term>
+<listitem>
+<para>
+Password for authorization
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Fail</term>
+<listitem>
+<para>
+Operation failed
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Drive</term>
+<listitem>
+<para>
+Drive the media should be placed in
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Config-Item</term>
+<listitem>
+<para>
+A string of the form
+<replaceable>item</replaceable>=<replaceable>value</replaceable> derived from
+the APT configuration space. These may include method specific values and
+general values not related to the method. It is up to the method to filter out
+the ones it wants.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Single-Instance</term>
+<listitem>
+<para>
+Requires that only one instance of the method be run This is a yes/no value.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Pipeline</term>
+<listitem>
+<para>
+The method is capable of pipelining.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Local</term>
+<listitem>
+<para>
+The method only returns Filename: fields.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Send-Config</term>
+<listitem>
+<para>
+Send configuration to the method.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Needs-Cleanup</term>
+<listitem>
+<para>
+The process is kept around while the files it returned are being used. This is
+primarily intended for CD-ROM and File URIs that need to unmount filesystems.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>Version</term>
+<listitem>
+<para>
+Version string for the method
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+<para>
+This is a list of which headers each status code can use
+</para>
+<variablelist>
+<varlistentry>
+<term>100 Capabilities</term>
+<listitem>
+<para>
+Displays the capabilities of the method. Methods should set the pipeline bit
+if their underlying protocol supports pipelining. The only known method that
+does support pipelining is http. Fields: Version, Single-Instance, Pre-Scan,
+Pipeline, Send-Config, Needs-Cleanup
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>101 Log</term>
+<listitem>
+<para>
+A log message may be printed to the screen if debugging is enabled. This is
+only for debugging the method. Fields: Message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>102 Status</term>
+<listitem>
+<para>
+Message gives a progress indication for the method. It can be used to show
+pre-transfer status for Internet type methods. Fields: Message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>200 URI Start</term>
+<listitem>
+<para>
+Indicates the URI is starting to be transferred. The URI is specified along
+with stats about the file itself. Fields: URI, Size, Last-Modified,
+Resume-Point
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>201 URI Done</term>
+<listitem>
+<para>
+Indicates that a URI has completed being transferred. It is possible to
+specify a <emphasis>201 URI Done</emphasis> without a <emphasis>URI
+Start</emphasis> which would mean no data was transferred but the file is now
+available. A Filename field is specified when the URI is directly available in
+the local pathname space. APT will either directly use that file or copy it
+into another location. It is possible to return Alt-* fields to indicate that
+another possibility for the URI has been found in the local pathname space.
+This is done if a decompressed version of a .gz file is found. Fields: URI,
+Size, Last-Modified, Filename, MD5-Hash
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>400 URI Failure</term>
+<listitem>
+<para>
+Indicates a fatal URI failure. The URI is not retrievable from this source. As
+with <emphasis>201 URI Done</emphasis> <emphasis>200 URI Start</emphasis> is
+not required to precede this message Fields: URI, Message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>401 General Failure</term>
+<listitem>
+<para>
+Indicates that some unspecific failure has occurred and the method is unable
+to  continue. The method should terminate after sending this message. It
+is intended to check for invalid configuration options or other severe
+conditions. Fields: Message
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>402 Authorization Required</term>
+<listitem>
+<para>
+The method requires a Username and Password pair to continue. After sending
+this message the method will expect APT to send a <emphasis>602 Authorization
+Credentials</emphasis> message with the required information. It is possible
+for a method to send this multiple times. Fields: Site
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>403 Media Failure</term>
+<listitem>
+<para>
+A method that deals with multiple media requires that a new media be
+inserted. The Media field contains the name of the media to be
+inserted. Fields: Media, Drive
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>600 URI Acquire</term>
+<listitem>
+<para>
+APT is requesting that a new URI be added to the acquire list. Last-Modified
+has the time stamp of the currently cache file if applicable. Filename is the
+name of the file that the acquired URI should be written to. Fields: URI,
+Filename Last-Modified
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>601 Configuration</term>
+<listitem>
+<para>
+APT is sending the configuration space to the method. A series of Config-Item
+fields will be part of this message, each containing an entry from the
+configuration space. Fields: Config-Item.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>602 Authorization Credentials</term>
+<listitem>
+<para>
+This is sent in response to a <emphasis>402 Authorization Required</emphasis>
+message. It contains the entered username and password. Fields: Site, User,
+Password
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>603 Media Changed</term>
+<listitem>
+<para>
+This is sent in response to a <emphasis>403 Media Failure</emphasis>
+message. It indicates that the user has changed media and it is safe
+to proceed. Fields: Media, Fail
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</section>
+
+<section id="s2.4"><title>Notes</title>
+<para>
+The methods supplied by the stock apt are:
+</para>
+<orderedlist numeration="arabic">
+<listitem>
+<para>
+cdrom - For Multi-Disc CD-ROMs
+</para>
+</listitem>
+<listitem>
+<para>
+copy - (internal) For copying files around the filesystem
+</para>
+</listitem>
+<listitem>
+<para>
+file - For local files
+</para>
+</listitem>
+<listitem>
+<para>
+gzip - (internal) For decompression
+</para>
+</listitem>
+<listitem>
+<para>
+http - For HTTP servers
+</para>
+</listitem>
+</orderedlist>
+<para>
+The two internal methods, copy and gzip, are used by the acquire code to
+parallize and simplify the automatic decompression of package files as well as
+copying package files around the file system. Both methods can be seen to act
+the same except that one decompresses on the fly. APT uses them by generating
+a copy URI that is formed identically to a file URI. The destination file is
+send as normal. The method then takes the file specified by the URI and writes
+it to the destination file. A typical set of operations may be:
+</para>
+<screen>
+http://foo.com/Packages.gz -&gt; /bar/Packages.gz
+gzip:/bar/Packages.gz -&gt; /bar/Packages.decomp
+rename Packages.decomp to /final/Packages
+</screen>
+<para>
+The http method implements a fully featured HTTP/1.1 client that supports
+deep pipelining and reget. It works best when coupled with an apache 1.3
+server. The file method simply generates failures or success responses
+with the filename field set to the proper location. The cdrom method acts
+the same except that it checks that the mount point has a valid cdrom in
+it. It does this by (effectively) computing a md5 hash of 'ls -l' on the
+mountpoint.
+</para>
+</section>
+
+</chapter>
+
+</book>
diff --git a/doc/method.sgml b/doc/method.sgml
deleted file mode 100644
index 5aa7b52e8..000000000
--- a/doc/method.sgml
+++ /dev/null
@@ -1,354 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
-<title>APT Method Interface </title>
-
-<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: method.sgml,v 1.10 2003/02/12 15:05:46 doogie Exp $</version>
-
-<abstract>
-This document describes the interface that APT uses to the archive
-access methods.
-</abstract>
-
-<copyright>
-Copyright &copy; Jason Gunthorpe, 1998.
-<p>
-"APT" and this document are free software; you can redistribute them and/or
-modify them under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-<p>
-For more details, on Debian systems, see the file
-/usr/share/common-licenses/GPL for the full license.
-</copyright>
-
-<toc sect>
-
-<chapt>Introduction
-<!-- General		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>General
-
-<p>
-The APT method interface allows APT to acquire archive files (.deb), index
-files (Packages, Release, Mirrors) and source files (.tar.gz, .diff). It
-is a general, extensible system designed to satisfy all of these
-requirements:
-
-<enumlist>
-<item>Remote methods that download files from a distant site
-<item>Resume of aborted downloads
-<item>Progress reporting
-<item>If-Modified-Since (IMS) checking for index files
-<item>In-Line MD5 generation
-<item>No-copy in-filesystem methods
-<item>Multi-media methods (like CD's)
-<item>Dynamic source selection for failure recovery
-<item>User interaction for user/password requests and media swaps
-<item>Global configuration
-</enumlist>
-
-Initial releases of APT (0.1.x) used a completely different method
-interface that only supported the first 6 items. This new interface
-deals with the remainder.
-</sect>
-                                                                  <!-- }}} -->
-<!-- Terms		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Terms
-
-<p>
-Several terms are used through out the document, they have specific
-meanings which may not be immediately evident. To clarify they are summarized
-here.
-
-<taglist>
-<tag>source<item>
-Refers to an item in source list. More specifically it is the broken down
-item, that is each source maps to exactly one index file. Archive sources
-map to Package files and Source Code sources map to Source files.
-
-<tag>archive file<item>
-Refers to a binary package archive (.deb, .rpm, etc). 
-
-<tag>source file<item>
-Refers to one of the files making up the source code of a package. In
-debian it is one of .diff.gz, .dsc. or .tar.gz.
-
-<tag>URI<item>
-Universal Resource Identifier (URI) is a super-set of the familiar URL
-syntax used by web browsers. It consists of an access specification
-followed by a specific location in that access space. The form is
-&lt;access&gt;:&lt;location&gt;. Network addresses are given with the form 
-&lt;access&gt;://[&lt;user&gt;[:&lt;pas&gt;]@]hostname[:port]/&lt;location&gt;. 
-Some examples:
-<example>
-file:/var/mirrors/debian/
-ftp://ftp.debian.org/debian
-ftp://jgg:MooCow@localhost:21/debian
-nfs://bigred/var/mirrors/debian
-rsync://debian.midco.net/debian
-cdrom:Debian 2.0r1 Disk 1/
-</example>
-
-<tag>method<item>
-There is a one to one mapping of URI access specifiers to methods. A method
-is a program that knows how to handle a URI access type and operates according
-to the specifications in this file.
-
-<tag>method instance<item>
-A specific running method. There can be more than one instance of each method
-as APT is capable of concurrent method handling.
-
-<tag>message<item>
-A series of lines terminated by a blank line sent down one of the
-communication lines. The first line should have the form xxx TAG
-where xxx are digits forming the status code and TAG is an informational
-string
-
-<tag>acquire<item>
-The act of bring a URI into the local pathname space. This may simply
-be verifying the existence of the URI or actually downloading it from
-a remote site.
-
-</taglist>
-
-</sect>
-                                                                  <!-- }}} -->
-<chapt>Specification
-<!-- Overview		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Overview
-
-<p>
-All methods operate as a sub process of a main controlling parent. 3 FD's
-are opened for use by the method allowing two way communication and
-emergency error reporting. The FD's correspond to the well known unix FD's, 
-stdin, stdout and stderr.
-
-<p>
-Through operation of the method communication is done via http 
-style plain text. Specifically RFC-822 (like the Package file) fields
-are used to describe items and a numeric-like header is used to indicate
-what is happening. Each of these distinct communication messages should be
-sent quickly and without pause.
-
-<p> 
-In some instances APT may pre-invoke a method to allow things like file
-URI's to determine how many files are available locally.
-</sect>
-                                                                  <!-- }}} -->
-<!-- Message Overview	                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Message Overview
-
-<p>
-The first line of each message is called the message header. The first
-3 digits (called the Status Code) have the usual meaning found in the 
-http protocol. 1xx is informational, 2xx is successful and 4xx is failure. 
-The 6xx series is used to specify things sent to the method. After the 
-status code is an informational string provided for visual debugging.
-
-<list>
-<item>100 Capabilities - Method capabilities
-<item>101 Log - General Logging
-<item>102 Status - Inter-URI status reporting (login progress)
-<item>200 URI Start - URI is starting acquire
-<item>201 URI Done - URI is finished acquire
-<item>400 URI Failure - URI has failed to acquire
-<item>401 General Failure - Method did not like something sent to it
-<item>402 Authorization Required - Method requires authorization
-        to access the URI. Authorization is User/Pass
-<item>403 Media Failure - Method requires a media change	
-<item>600 URI Acquire - Request a URI be acquired
-<item>601 Configuration - Sends the configuration space
-<item>602 Authorization Credentials - Response to the 402 message
-<item>603 Media Changed - Response to the 403 message
-</list>
-
-Only the 6xx series of status codes is sent TO the method. Furthermore
-the method may not emit status codes in the 6xx range. The Codes 402
-and 403 require that the method continue reading all other 6xx codes
-until the proper 602/603 code is received. This means the method must be
-capable of handling an unlimited number of 600 messages.
-
-<p>
-The flow of messages starts with the method sending out a 
-<em>100 Capabilities</> and APT sending out a <em>601 Configuration</>.
-After that APT begins sending <em>600 URI Acquire</> and the method
-sends out <em>200 URI Start</>, <em>201 URI Done</> or 
-<em>400 URI Failure</>. No synchronization is performed, it is expected
-that APT will send <em>600 URI Acquire</> messages at -any- time and
-that the method should queue the messages. This allows methods like http
-to pipeline requests to the remote server. It should be noted however
-that APT will buffer messages so it is not necessary for the method
-to be constantly ready to receive them.
-</sect>
-                                                                  <!-- }}} -->
-<!-- Header Fields	                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Header Fields
-
-<p> 
-The following is a short index of the header fields that are supported
-
-<taglist>
-<tag>URI<item>URI being described by the message
-<tag>Filename<item>Location in the filesystem
-<tag>Last-Modified<item>A time stamp in RFC1123 notation for use by IMS checks
-<tag>IMS-Hit<item>The already existing item is valid
-<tag>Size<item>Size of the file in bytes
-<tag>Resume-Point<item>Location that transfer was started
-<tag>MD5-Hash<item>Computed MD5 hash for the file
-<tag>Message<item>String indicating some displayable message
-<tag>Media<item>String indicating the media name required
-<tag>Site<item>String indicating the site authorization is required for
-<tag>User<item>Username for authorization
-<tag>Password<item>Password for authorization
-<tag>Fail<item>Operation failed
-<tag>Drive<item>Drive the media should be placed in
-<tag>Config-Item<item>
-A string of the form <var>item</>=<var>value</> derived from the APT 
-configuration space. These may include method specific values and general
-values not related to the method. It is up to the method to filter out
-the ones it wants.
-<tag>Single-Instance<item>Requires that only one instance of the method be run
-                          This is a yes/no value.
-<tag>Pipeline<item>The method is capable of pipelining.
-<tag>Local<item>The method only returns Filename: fields.
-<tag>Send-Config<item>Send configuration to the method.
-<tag>Needs-Cleanup<item>The process is kept around while the files it returned
-are being used. This is primarily intended for CD-ROM and File URIs that need
-to unmount filesystems.
-<tag>Version<item>Version string for the method
-</taglist>
-
-This is a list of which headers each status code can use
-
-<taglist>
-<tag>100 Capabilities<item>
-Displays the capabilities of the method. Methods should set the
-pipeline bit if their underlying protocol supports pipelining. The
-only known method that does support pipelining is http.
-Fields: Version, Single-Instance, Pre-Scan, Pipeline, Send-Config, 
-Needs-Cleanup
-
-<tag>101 Log<item>
-A log message may be printed to the screen if debugging is enabled. This
-is only for debugging the method.
-Fields: Message
-
-<tag>102 Status<item>
-Message gives a progress indication for the method. It can be used to show
-pre-transfer status for Internet type methods.
-Fields: Message
-
-<tag>200 URI Start<item>
-Indicates the URI is starting to be transferred. The URI is specified
-along with stats about the file itself.
-Fields: URI, Size, Last-Modified, Resume-Point
-
-<tag>201 URI Done<item>
-Indicates that a URI has completed being transferred. It is possible
-to specify a <em>201 URI Done</> without a <em>URI Start</> which would
-mean no data was transferred but the file is now available. A Filename
-field is specified when the URI is directly available in the local 
-pathname space. APT will either directly use that file or copy it into 
-another location. It is possible to return Alt-* fields to indicate that
-another possibility for the URI has been found in the local pathname space.
-This is done if a decompressed version of a .gz file is found.
-Fields: URI, Size, Last-Modified, Filename, MD5-Hash
-
-<tag>400 URI Failure<item>
-Indicates a fatal URI failure. The URI is not retrievable from this source.
-As with <em>201 URI Done</> <em>200 URI Start</> is not required to precede
-this message
-Fields: URI, Message
-
-<tag>401 General Failure<item>
-Indicates that some unspecific failure has occurred and the method is unable
-to continue. The method should terminate after sending this message. It 
-is intended to check for invalid configuration options or other severe
-conditions.
-Fields: Message
-
-<tag>402 Authorization Required<item>
-The method requires a Username and Password pair to continue. After sending
-this message the method will expect APT to send a <em>602 Authorization 
-Credentials</> message with the required information. It is possible for
-a method to send this multiple times.
-Fields: Site
-
-<tag>403 Media Failure<item>
-A method that deals with multiple media requires that a new media be inserted.
-The Media field contains the name of the media to be inserted.
-Fields: Media, Drive
-
-<tag>600 URI Acquire<item>
-APT is requesting that a new URI be added to the acquire list. Last-Modified
-has the time stamp of the currently cache file if applicable. Filename
-is the name of the file that the acquired URI should be written to.
-Fields: URI, Filename Last-Modified
-
-<tag>601 Configuration<item>
-APT is sending the configuration space to the method. A series of
-Config-Item fields will be part of this message, each containing an entry
-from the configuration space.
-Fields: Config-Item.
-
-<tag>602 Authorization Credentials<item>
-This is sent in response to a <em>402 Authorization Required</> message. 
-It contains the entered username and password.
-Fields: Site, User, Password
-
-<tag>603 Media Changed<item>
-This is sent in response to a <em>403 Media Failure</> message. It
-indicates that the user has changed media and it is safe to proceed.
-Fields: Media, Fail
-</taglist>
-
-</sect>
-                                                                  <!-- }}} -->
-<!-- Method Notes		                                       {{{ -->
-<!-- ===================================================================== -->
-<sect>Notes
-
-<p>
-The methods supplied by the stock apt are:
-<enumlist>
-<item>cdrom - For Multi-Disc CD-ROMs
-<item>copy - (internal) For copying files around the filesystem
-<item>file - For local files
-<item>gzip - (internal) For decompression
-<item>http - For HTTP servers
-</enumlist>
-
-<p>
-The two internal methods, copy and gzip, are used by the acquire code to
-parallize and simplify the automatic decompression of package files as well 
-as copying package files around the file system. Both methods can be seen to 
-act the same except that one decompresses on the fly. APT uses them by
-generating a copy URI that is formed identically to a file URI. The destination
-file is send as normal. The method then takes the file specified by the 
-URI and writes it to the destination file. A typical set of operations may
-be:
-<example>
-http://foo.com/Packages.gz -> /bar/Packages.gz
-gzip:/bar/Packages.gz -> /bar/Packages.decomp
-rename Packages.decomp to /final/Packages
-</example>
-
-<p>
-The http method implements a fully featured HTTP/1.1 client that supports
-deep pipelining and reget. It works best when coupled with an apache 1.3
-server. The file method simply generates failures or success responses with
-the filename field set to the proper location. The cdrom method acts the same
-except that it checks that the mount point has a valid cdrom in it. It does 
-this by (effectively) computing a md5 hash of 'ls -l' on the mountpoint.
-
-</sect>
-                                                                  <!-- }}} -->
-
-</book>
diff --git a/doc/offline.sgml b/doc/offline.dbk
index 659ca3147..cbfc4f690 100644
--- a/doc/offline.sgml
+++ b/doc/offline.dbk
@@ -1,74 +1,90 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book 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;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
+]>
+
+<book lang="en">
+
 <title>Using APT Offline</title>
 
-<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $</version>
+<bookinfo>
+
+<authorgroup>
+  <author>
+    <personname>Jason Gunthorpe</personname><email>jgg@debian.org</email>
+  </author>
+</authorgroup>
+
+<releaseinfo>Version &apt-product-version;</releaseinfo>
 
 <abstract>
-This document describes how to use APT in a non-networked environment, 
+<para>
+This document describes how to use APT in a non-networked environment,
 specifically a 'sneaker-net' approach for performing upgrades.
+</para>
 </abstract>
 
-<copyright>
-Copyright &copy; Jason Gunthorpe, 1999.
-<p>
+<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>
+
+<legalnotice>
+<title>License Notice</title>
+<para>
 "APT" and this document are free software; you can redistribute them and/or
-modify them under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
+modify them under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
 option) any later version.
-
-<p>
+</para>
+<para>
 For more details, on Debian systems, see the file
 /usr/share/common-licenses/GPL for the full license.
-</copyright>
+</para>
+</legalnotice>
 
-<toc sect>
+</bookinfo>
 
-<chapt>Introduction
-<!-- Overview		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Overview
+<chapter id="ch1"><title>Introduction</title>
 
-<p>
+<section id="s1.1"><title>Overview</title>
+<para>
 Normally APT requires direct access to a Debian archive, either from a local
 media or through a network. Another common complaint is that a Debian machine
-is on a slow link, such as a modem and another machine has a very fast 
+is on a slow link, such as a modem and another machine has a very fast
 connection but they are physically distant.
-
-<p>
-The solution to this is to use large removable media such as a Zip disc or a 
+</para>
+<para>
+The solution to this is to use large removable media such as a Zip disc or a
 SuperDisk disc. These discs are not large enough to store the entire Debian
-archive but can easily fit a subset large enough for most users. The idea
-is to use APT to generate a list of packages that are required and then fetch
-them onto the disc using another machine with good connectivity. It is 
-even possible to use another Debian machine with APT or to use a completely 
-different OS and a download tool like wget. Let <em>remote host</em> mean the
-machine downloading the packages, and <em>target host</em> the one with bad or
-no connection.
-
-<p>
+archive but can easily fit a subset large enough for most users. The idea is
+to use APT to generate a list of packages that are required and then fetch them
+onto the disc using another machine with good connectivity. It is even
+possible to use another Debian machine with APT or to use a completely
+different OS and a download tool like wget. Let <emphasis>remote
+host</emphasis> mean the machine downloading the packages, and <emphasis>target
+host</emphasis> the one with bad or no connection.
+</para>
+<para>
 This is achieved by creatively manipulating the APT configuration file. The
 essential premise to tell APT to look on a disc for it's archive files. Note
 that the disc should be formated with a filesystem that can handle long file
 names such as ext2, fat32 or vfat.
+</para>
+</section>
 
-</sect>
-                                                                  <!-- }}} -->
+</chapter>
 
-<chapt>Using APT on both machines
-<!-- Overview		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Overview
+<chapter id="ch2"><title>Using APT on both machines</title>
 
-<p>
-APT being available on both machines gives the simplest configuration. The 
-basic idea is to place a copy of the status file on the disc and use the 
-remote machine to fetch the latest package files and decide which packages to 
+<section id="s2.1"><title>Overview</title>
+<para>
+APT being available on both machines gives the simplest configuration. The
+basic idea is to place a copy of the status file on the disc and use the remote
+machine to fetch the latest package files and decide which packages to
 download. The disk directory structure should look like:
-
-<example>
+</para>
+<screen>
   /disc/
     archives/
        partial/
@@ -77,36 +93,32 @@ download. The disk directory structure should look like:
     status
     sources.list
     apt.conf
-</example>
-
-</sect>
-                                                                  <!-- }}} -->
-<!-- The configuartion file                                            {{{ -->
-<!-- ===================================================================== -->
-<sect>The configuration file
-
-<p>
-The configuration file should tell APT to store its files on the disc and
-to use the configuration files on the disc as well. The sources.list should
-contain the proper sites that you wish to use from the remote machine, and
-the status file should be a copy of <em>/var/lib/dpkg/status</em> from the
-<em>target host</em>. Please note, if you are using a local archive you must use
-copy URIs, the syntax is identical to file URIs.
-
-<p>
-<em>apt.conf</em> must contain the necessary information to make APT use the 
-disc:
-
-<example>
+</screen>
+</section>
+
+<section id="s2.2"><title>The configuration file</title>
+<para>
+The configuration file should tell APT to store its files on the disc and to
+use the configuration files on the disc as well. The sources.list should
+contain the proper sites that you wish to use from the remote machine, and the
+status file should be a copy of <emphasis>/var/lib/dpkg/status</emphasis> from
+the <emphasis>target host</emphasis>. Please note, if you are using a local
+archive you must use copy URIs, the syntax is identical to file URIs.
+</para>
+<para>
+<emphasis>apt.conf</emphasis> must contain the necessary information to make
+APT use the disc:
+</para>
+<screen>
  APT
  {
    /* This is not necessary if the two machines are the same arch, it tells
       the remote APT what architecture the target machine is */
    Architecture "i386";
-   
+
    Get::Download-Only "true";
  };
- 
+
  Dir
  {
    /* Use the disc for state information and redirect the status file from
@@ -117,120 +129,120 @@ disc:
    // Binary caches will be stored locally
    Cache::archives "/disc/archives/";
    Cache "/tmp/";
-   
+
    // Location of the source list.
    Etc "/disc/";
- }; 
-</example>
-
+ };
+</screen>
+<para>
 More details can be seen by examining the apt.conf man page and the sample
-configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>.
-
-<p>
-On the target machine the first thing to do is mount the disc and copy 
-<em>/var/lib/dpkg/status</em> to it. You will also need to create the directories
-outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em>.
-Then take the disc to the remote machine and configure the sources.list. 
-On the remote machine execute the following:
-
-<example>
+configuration file in
+<emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>.
+</para>
+<para>
+On the target machine the first thing to do is mount the disc and copy
+<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need
+to create the directories outlined in the Overview,
+<emphasis>archives/partial/</emphasis> and
+<emphasis>lists/partial/</emphasis>. Then take the disc to the
+remote machine and configure the sources.list. On the remote
+machine execute the following:
+</para>
+<screen>
  # export APT_CONFIG="/disc/apt.conf"
  # apt-get update
  [ APT fetches the package files ]
  # apt-get dist-upgrade
  [ APT fetches all the packages needed to upgrade the target machine ]
-</example>
-
+</screen>
+<para>
 The dist-upgrade command can be replaced with any other standard APT commands,
-particularly dselect-upgrade. You can even use an APT front end such as 
-<em>dselect</em>. However this presents a problem in communicating your 
-selections back to the local computer.
-
-<p>
-Now the disc contains all of the index files and archives needed to upgrade
-the target machine. Take the disc back and run:
-
-<example>
+particularly dselect-upgrade. You can even use an APT front end such as
+<emphasis>dselect</emphasis>. However this presents a problem in communicating
+your selections back to the local computer.
+</para>
+<para>
+Now the disc contains all of the index files and archives needed to upgrade the
+target machine. Take the disc back and run:
+</para>
+<screen>
   # export APT_CONFIG="/disc/apt.conf"
   # apt-get check
   [ APT generates a local copy of the cache files ]
   # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade
   [ Or any other APT command ]
-</example>
-
-<p> 
-It is necessary for proper function to re-specify the status file to be the 
+</screen>
+<para>
+It is necessary for proper function to re-specify the status file to be the
 local one. This is very important!
-
-<p>
-If you are using dselect you can do the very risky operation of copying 
+</para>
+<para>
+If you are using dselect you can do the very risky operation of copying
 disc/status to /var/lib/dpkg/status so that any selections you made on the
-remote machine are updated. I highly recommend that people only make selections
-on the local machine - but this may not always be possible. DO NOT copy
-the status file if dpkg or APT have been run in the mean time!!
-
-</sect>
-                                                                  <!-- }}} -->
-
-<chapt>Using APT and wget
-<!-- Overview		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Overview
-
-<p>
-<em>wget</em> is a popular and portable download tool that can run on nearly
-any machine. Unlike the method above this requires that the Debian machine
-already has a list of available packages.
-
-<p>
+remote machine are updated. I highly recommend that people only make
+selections on the local machine - but this may not always be possible. DO NOT
+copy the status file if dpkg or APT have been run in the mean time!!
+</para>
+</section>
+
+</chapter>
+
+<chapter id="ch3"><title>Using APT and wget</title>
+
+<section id="s3.1"><title>Overview</title>
+<para>
+<emphasis>wget</emphasis> is a popular and portable download tool that can run
+on nearly any machine. Unlike the method above this requires that the Debian
+machine already has a list of available packages.
+</para>
+<para>
 The basic idea is to create a disc that has only the archive files downloaded
 from the remote site. This is done by using the --print-uris option to apt-get
 and then preparing a wget script to actually fetch the packages.
+</para>
+</section>
 
-</sect>
-                                                                  <!-- }}} -->
-<!-- Operation		                                               {{{ -->
-<!-- ===================================================================== -->
-<sect>Operation
-
-<p>
+<section id="s3.2"><title>Operation</title>
+<para>
 Unlike the previous technique no special configuration files are required. We
 merely use the standard APT commands to generate the file list.
-
-<example>
- # apt-get dist-upgrade 
+</para>
+<screen>
+ # apt-get dist-upgrade
  [ Press no when prompted, make sure you are happy with the actions ]
- # apt-get -qq --print-uris dist-upgrade > uris
- # awk '{print "wget -O " $2 " " $1}' < uris > /disc/wget-script
-</example>
-
-Any command other than dist-upgrade could be used here, including 
+ # apt-get -qq --print-uris dist-upgrade &gt; uris
+ # awk '{print "wget -O " $2 " " $1}' &lt; uris &gt; /disc/wget-script
+</screen>
+<para>
+Any command other than dist-upgrade could be used here, including
 dselect-upgrade.
-
-<p>
-The /disc/wget-script file will now contain a list of wget commands to execute 
+</para>
+<para>
+The /disc/wget-script file will now contain a list of wget commands to execute
 in order to fetch the necessary archives. This script should be run with the
-current directory as the disc's mount point so as to save the output on the 
+current directory as the disc's mount point so as to save the output on the
 disc.
-
-<p>
+</para>
+<para>
 The remote machine would do something like
-
-<example>
+</para>
+<screen>
   # cd /disc
   # sh -x ./wget-script
   [ wait.. ]
-</example>
-
+</screen>
+<para>
 Once the archives are downloaded and the disc returned to the Debian machine
 installation can proceed using,
-
-<example>
+</para>
+<screen>
   # apt-get -o dir::cache::archives="/disc/" dist-upgrade
-</example>
-
+</screen>
+<para>
 Which will use the already fetched archives on the disc.
+</para>
+</section>
+
+</chapter>
 
-</sect>
-                                                                  <!-- }}} -->
 </book>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 7a51f0ab5..83e1de724 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 1.0.4ubuntu1\n"
+"Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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,27 +497,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: 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
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21 apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21 apt-config.8.xml:22
 msgid "8"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: 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
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22 apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22 sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23 apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33 apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33 apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32 sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34 apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -526,7 +526,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -535,28 +535,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 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
+#: apt.8.xml:60
 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
+#: apt.8.xml:67
 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
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -577,30 +577,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 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
+#: apt.8.xml:95
 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
+#: apt.8.xml:101
 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."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 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 "
@@ -608,17 +608,17 @@ msgid ""
 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
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104 apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44 apt-ftparchive.1.xml:500
 msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 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 "
@@ -628,12 +628,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 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 "
@@ -641,60 +641,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:151
 msgid "The option <literal>APT::Color</literal> is enabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 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
+#: apt.8.xml:160
 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
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191 apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148 apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701 sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59 apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 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
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131 apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 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
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt-get.8.xml:35
 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 "
@@ -703,14 +703,14 @@ msgid ""
 msgstr ""
 
 #. 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 apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40 apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -725,7 +725,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -741,7 +741,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -756,7 +756,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, "
@@ -767,7 +767,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -784,14 +784,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 msgid ""
 "This is also the target to use if you want to upgrade one or more "
 "already-installed packages without upgrading every package you have on your "
@@ -803,14 +803,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -822,7 +822,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -830,7 +830,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -842,7 +842,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via "
 "<literal>deb-src</literal> lines in the &sources-list; file. This means that "
@@ -852,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -862,7 +862,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -872,7 +872,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -880,7 +880,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -890,21 +890,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -913,7 +913,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -925,7 +925,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -933,7 +933,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -948,28 +948,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 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 "
@@ -985,7 +985,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -997,7 +997,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with "
 "<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -1006,7 +1006,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1018,7 +1018,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: "
@@ -1026,7 +1026,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option "
@@ -1038,7 +1038,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1048,7 +1048,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1058,28 +1058,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: "
 "<literal>APT::Get::Assume-No</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by "
 "<command>apt-get source --compile</command> and how cross-builddependencies "
@@ -1090,7 +1090,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 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 "
@@ -1100,14 +1100,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 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:396
+#: apt-get.8.xml:390
 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 "
@@ -1116,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1128,7 +1128,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with "
 "<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -1137,7 +1137,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with "
 "<literal>install</literal>, <literal>only-upgrade</literal> will install "
@@ -1147,7 +1147,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1157,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1170,7 +1170,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 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 "
@@ -1180,14 +1180,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 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:462
+#: apt-get.8.xml:456
 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 "
@@ -1198,7 +1198,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1213,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where "
@@ -1223,14 +1223,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 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:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or "
 "<literal>remove</literal>, then this option acts like running the "
@@ -1239,7 +1239,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 msgid ""
 "Only has meaning for the <literal>source</literal> and "
 "<literal>build-dep</literal> commands.  Indicates that the given source "
@@ -1251,7 +1251,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -1260,14 +1260,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 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:529
+#: apt-get.8.xml:523
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: "
@@ -1275,7 +1275,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1285,12 +1285,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121 apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1298,19 +1298,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1319,19 +1319,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165 apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208 apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159 apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202 apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1345,7 +1345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1361,7 +1361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -1373,21 +1373,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1396,7 +1396,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -1407,7 +1407,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -1416,7 +1416,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1425,7 +1425,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1435,7 +1435,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -1445,14 +1445,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1460,28 +1460,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the "
 "cache. It is primarily for debugging."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg "
 "--print-avail</command>; it displays the package records for the named "
@@ -1489,12 +1489,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -1507,33 +1507,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1543,7 +1543,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1551,7 +1551,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink "
@@ -1564,7 +1564,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -1573,12 +1573,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
 "url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@ -1586,12 +1586,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1600,7 +1600,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1612,7 +1612,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: "
@@ -1620,7 +1620,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1630,7 +1630,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1639,7 +1639,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -1647,7 +1647,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -1657,14 +1657,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If "
@@ -1675,7 +1675,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use "
@@ -1684,14 +1684,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: "
@@ -1699,7 +1699,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1707,7 +1707,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and "
 "<literal>rdepends</literal> to packages which are currently installed.  "
@@ -1715,24 +1715,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -1740,12 +1740,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -1753,39 +1753,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -1794,7 +1794,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -1805,19 +1805,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -1828,54 +1828,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -1885,7 +1885,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -1893,7 +1893,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -1901,7 +1901,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -1911,14 +1911,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -1927,7 +1927,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -1935,14 +1935,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -1951,19 +1951,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -1972,7 +1972,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 msgid ""
 "If a package comes from a archive without a signature, or with a signature "
 "that apt does not have a key for, that package is considered untrusted, and "
@@ -1982,19 +1982,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2005,7 +2005,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2014,7 +2014,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. In order to become "
@@ -2025,7 +2025,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2038,7 +2038,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2046,14 +2046,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2063,7 +2063,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2072,7 +2072,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2081,12 +2081,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys, although an installation of "
@@ -2095,7 +2095,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2106,19 +2106,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive "
@@ -2126,7 +2126,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg "
 "--clearsign -o InRelease Release</command> and <command>gpg -abs -o "
@@ -2134,7 +2134,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2142,7 +2142,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -2150,14 +2150,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink "
 "url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2168,24 +2168,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -2194,7 +2194,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -2202,7 +2202,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -2212,7 +2212,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in "
@@ -2220,14 +2220,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: "
@@ -2235,7 +2235,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 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.  "
@@ -2243,7 +2243,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2251,7 +2251,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: "
@@ -2259,7 +2259,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2268,7 +2268,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2276,7 +2276,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -2284,24 +2284,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -2310,7 +2310,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 msgid ""
 "shell is used to access the configuration information from a shell "
 "script. It is given pairs of arguments, the first being a shell variable and "
@@ -2320,7 +2320,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -2329,14 +2329,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of "
 "MyApp::options with a default of <option>-f</option>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -2344,24 +2344,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use "
 "--no-empty to remove them from the output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -2372,39 +2372,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66 apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60 apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -2413,21 +2413,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -2439,24 +2439,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -2466,7 +2466,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -2481,7 +2481,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -2493,7 +2493,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -2501,27 +2501,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -2531,7 +2531,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -2543,7 +2543,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -2553,7 +2553,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -2565,7 +2565,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -2582,19 +2582,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -2602,7 +2602,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -2616,7 +2616,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -2625,7 +2625,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -2634,14 +2634,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 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:201
+#: apt.conf.5.xml:195
 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 "
@@ -2650,7 +2650,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 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 "
@@ -2665,7 +2665,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -2682,7 +2682,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 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 "
@@ -2693,7 +2693,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 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 "
@@ -2706,7 +2706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 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 "
@@ -2727,38 +2727,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 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:282
+#: apt.conf.5.xml:276
 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:287
+#: apt.conf.5.xml:281
 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:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -2766,7 +2766,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -2779,7 +2779,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2791,7 +2791,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2803,7 +2803,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2811,7 +2811,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 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 "
@@ -2823,7 +2823,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of "
 "<literal>host</literal> or <literal>access</literal> which determines how "
@@ -2833,21 +2833,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 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:364
+#: apt.conf.5.xml:358
 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:369
+#: apt.conf.5.xml:363
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
 "URIs. It is in the standard form of "
@@ -2860,7 +2860,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 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 "
@@ -2872,14 +2872,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 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:390
+#: apt.conf.5.xml:384
 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 "
@@ -2891,14 +2891,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 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:400
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with "
 "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -2908,7 +2908,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -2916,7 +2916,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 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 "
@@ -2930,7 +2930,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2941,7 +2941,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2965,7 +2965,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of "
@@ -2986,7 +2986,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -2996,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the "
 "<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
@@ -3006,7 +3006,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3016,13 +3016,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3035,7 +3035,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is "
 "<literal>gpgv::Options</literal>, which passes additional parameters to "
@@ -3043,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, no-wrap
 msgid ""
 "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -3051,7 +3051,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -3063,19 +3063,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -3093,13 +3093,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the "
 "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -3115,7 +3115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -3123,7 +3123,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -3132,7 +3132,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the "
@@ -3144,13 +3144,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and "
 "\"en\". \"<literal>environment</literal>\" has a special meaning here: it "
@@ -3172,7 +3172,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -3182,22 +3182,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -3209,20 +3209,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3232,7 +3233,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -3240,7 +3241,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by "
 "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3252,7 +3253,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3265,7 +3266,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -3276,12 +3277,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3289,7 +3290,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, "
@@ -3303,40 +3304,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 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:682
+#: 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 update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 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:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 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:699
+#: apt.conf.5.xml:694
 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 "
@@ -3344,7 +3345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -3353,7 +3354,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 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 "
@@ -3364,7 +3365,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3373,7 +3374,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3384,7 +3385,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</literal> "
@@ -3395,26 +3396,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 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:746
+#: apt.conf.5.xml:741
 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:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 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 "
@@ -3429,7 +3430,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3439,7 +3440,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -3453,7 +3454,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -3466,7 +3467,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is "
@@ -3484,7 +3485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure "
 "--pending</command> to let &dpkg; handle all required configurations and "
@@ -3496,7 +3497,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -3507,7 +3508,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3519,7 +3520,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 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 "
@@ -3533,12 +3534,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -3547,12 +3548,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3563,7 +3564,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -3571,7 +3572,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s "
@@ -3579,7 +3580,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3589,65 +3590,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:877
+#: apt.conf.5.xml:872
 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:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 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:951
+#: apt.conf.5.xml:946
 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:961
+#: apt.conf.5.xml:956
 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:971
+#: apt.conf.5.xml:966
 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:981
+#: apt.conf.5.xml:976
 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 "
@@ -3655,52 +3656,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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:1004
+#: apt.conf.5.xml:999
 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:1014
+#: apt.conf.5.xml:1009
 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:1024
+#: apt.conf.5.xml:1019
 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:1036
+#: apt.conf.5.xml:1031
 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:1047
+#: apt.conf.5.xml:1042
 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:1058
+#: apt.conf.5.xml:1053
 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:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial "
@@ -3710,7 +3711,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as "
 "keep/install/remove while the ProblemResolver does his work.  Each addition "
@@ -3728,45 +3729,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 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:1114
+#: apt.conf.5.xml:1109
 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:1125
+#: apt.conf.5.xml:1120
 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:1137
+#: apt.conf.5.xml:1132
 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:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 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:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -3774,14 +3775,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 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
+#: apt.conf.5.xml:1186
 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 "
@@ -3789,12 +3790,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233 apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3802,17 +3803,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -3821,7 +3822,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -3834,7 +3835,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -3844,7 +3845,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -3858,7 +3859,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -3871,12 +3872,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid ""
 "<command>apt-get install -t testing "
@@ -3884,13 +3885,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -3907,19 +3908,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their "
 "<filename>Release</filename> files are marked as \"NotAutomatic: yes\" but "
@@ -3928,12 +3929,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -3942,29 +3943,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid "to the versions that are not installed and belong to the target release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -3975,14 +3976,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -3992,19 +3993,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the "
@@ -4012,7 +4013,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -4023,7 +4024,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -4033,7 +4034,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -4045,12 +4046,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -4059,7 +4060,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -4070,7 +4071,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -4079,7 +4080,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -4089,7 +4090,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -4097,7 +4098,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4106,7 +4107,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -4115,7 +4116,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4124,7 +4125,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -4134,7 +4135,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is "
@@ -4142,7 +4143,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4151,7 +4152,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is "
@@ -4159,7 +4160,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4168,7 +4169,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -4176,7 +4177,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4185,12 +4186,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -4200,7 +4201,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -4209,7 +4210,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -4217,7 +4218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4226,7 +4227,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -4237,89 +4238,89 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -4328,14 +4329,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -4352,12 +4353,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -4368,7 +4369,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -4376,7 +4377,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an "
@@ -4385,12 +4386,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -4398,7 +4399,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@ -4410,27 +4411,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -4443,12 +4444,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -4459,18 +4460,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -4481,13 +4482,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -4498,7 +4499,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -4507,12 +4508,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -4524,18 +4525,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -4544,18 +4545,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -4564,13 +4565,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -4585,12 +4586,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -4598,12 +4599,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -4618,7 +4619,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -4628,7 +4629,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620 apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614 apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -4637,7 +4638,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -4646,13 +4647,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -4661,12 +4662,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4683,7 +4684,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -4694,7 +4695,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -4703,13 +4704,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -4721,12 +4722,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package "
@@ -4748,7 +4749,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -4763,7 +4764,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -4772,13 +4773,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -4790,17 +4791,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -4811,7 +4812,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type "
 "(e.g. <literal>deb-src</literal>)  followed by options and arguments for "
@@ -4821,12 +4822,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -4839,12 +4840,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -4860,20 +4861,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -4896,14 +4897,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder "
 "type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 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.  "
@@ -4916,7 +4917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, "
 "<literal>$(ARCH)</literal> which expands to the Debian architecture (such as "
@@ -4928,7 +4929,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 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 "
@@ -4944,7 +4945,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -4955,7 +4956,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
 "can be used to specify for which architectures information should be "
@@ -4964,7 +4965,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
 "and "
@@ -4974,7 +4975,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the "
@@ -4986,7 +4987,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -4995,12 +4996,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -5010,17 +5011,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -5028,7 +5029,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media "
 "swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -5036,7 +5037,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format "
@@ -5047,7 +5048,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual "
@@ -5060,7 +5061,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -5069,7 +5070,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5078,12 +5079,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme "
@@ -5095,42 +5096,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5138,7 +5139,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -5146,33 +5147,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -5181,19 +5182,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under "
@@ -5205,24 +5206,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -5232,12 +5233,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -5247,7 +5248,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: "
@@ -5255,19 +5256,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -5276,31 +5277,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: "
 "<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -5309,7 +5310,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the "
@@ -5319,7 +5320,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -5329,7 +5330,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -5338,12 +5339,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -5352,7 +5353,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -5360,7 +5361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it for "
@@ -5371,7 +5372,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -5387,7 +5388,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under "
@@ -5401,7 +5402,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -5411,19 +5412,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -5434,17 +5435,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid "The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -5453,7 +5454,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -5461,29 +5462,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the "
 "<literal>FileList</literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -5491,7 +5492,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -5500,42 +5501,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section "
@@ -5543,14 +5544,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -5558,12 +5559,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -5571,7 +5572,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each "
 "day. The contents files are round-robined so that over several days they "
@@ -5579,7 +5580,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is "
@@ -5590,35 +5591,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to "
@@ -5626,7 +5627,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to "
@@ -5634,7 +5635,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. If this setting "
@@ -5644,19 +5645,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -5664,7 +5665,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -5673,12 +5674,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -5688,7 +5689,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -5697,7 +5698,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -5705,7 +5706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -5715,7 +5716,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section "
 "<command>apt-ftparchive</command> performs an operation similar to: "
@@ -5723,7 +5724,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib "
@@ -5731,7 +5732,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -5739,36 +5740,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -5778,54 +5779,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -5835,19 +5836,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder "
 "type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -5858,12 +5859,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -5871,12 +5872,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -5884,7 +5885,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -5900,14 +5901,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -5916,7 +5917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -5925,7 +5926,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -5935,7 +5936,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: "
@@ -5943,14 +5944,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -5959,7 +5960,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -5973,7 +5974,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -5983,7 +5984,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid ""
 "<command>apt-ftparchive</command> packages "
@@ -5992,48 +5993,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
 msgstr ""
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr ""
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr ""
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
 msgstr ""
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
 msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package "
 "manager."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid "<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them "
 "and/or modify them under the terms of the GNU General Public License as "
@@ -6041,42 +6057,42 @@ msgid ""
 "or (at your option) any later version."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file "
 "/usr/share/common-licenses/GPL for the full license."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
 "The APT package currently contains two sections, the APT "
-"<prgn>dselect</prgn> method and the <prgn>apt-get</prgn> command line user "
-"interface. Both provide a way to install and remove packages as well as "
-"download new packages from the Internet."
+"<command>dselect</command> method and the <command>apt-get</command> command "
+"line user interface. Both provide a way to install and remove packages as "
+"well as download new packages from the Internet."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -6085,8 +6101,8 @@ msgid ""
 "in mail transport agents, X servers and so on."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -6094,8 +6110,8 @@ msgid ""
 "properly."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -6103,8 +6119,8 @@ msgid ""
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -6116,8 +6132,8 @@ msgid ""
 "other mail transport agents."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -6129,8 +6145,8 @@ msgid ""
 "trying to manually fix packages."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -6138,71 +6154,78 @@ msgid ""
 "packages for installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:102
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
 msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:109
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
 msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see "
-"sources.list(5)</p></footnote> thing that should be done before using "
-"<prgn>apt-get</prgn> is to fetch the package lists from the <em>Sources</em> "
-"so that it knows what packages are available. This is done with <tt>apt-get "
-"update</tt>. For instance,"
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For "
+"instance,"
+msgstr ""
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other "
+"package. <command>dselect</command> or <literal>apt-get install</literal> "
+"can be used to force these packages to install."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -6213,131 +6236,135 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use "
 "dist-upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then "
-"<prgn>dselect</prgn> can be used to install any packages that may have been "
-"left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
 msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed 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 used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, "
+"<citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</manvolnum></citerefentry>. "
+"The most useful option is <literal>-d</literal> 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 <literal>-d</literal> is used the downloaded archives can be "
+"installed by simply running the command that caused them to be downloaded "
+"again without <literal>-d</literal>."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection "
+"GUI. <command>dselect</command> is used to select the packages to be "
+"installed or removed and APT actually installs them."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CD-ROM then "
-"it is a good idea to specify it first and then specify a mirror so that you "
-"have access to the latest bug fixes. APT will automatically use packages on "
-"your CD-ROM before downloading from the Internet."
+"To enable the APT method you need to select [A]ccess in "
+"<command>dselect</command> and then choose the APT method. You will be "
+"prompted for a set of <emphasis>Sources</emphasis> which are places to fetch "
+"archives from. These can be remote Internet sites, local Debian mirrors or "
+"CD-ROMs. Each source can provide a fragment of the total Debian archive, APT "
+"will automatically combine them to form a complete set of packages. If you "
+"have a CD-ROM then it is a good idea to specify it first and then specify a "
+"mirror so that you have access to the latest bug fixes. APT will "
+"automatically use packages on your CD-ROM before downloading from the "
+"Internet."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:198
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:222
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
 msgid ""
 "The distribution refers to the Debian version in the archive, "
-"<em>stable</em> refers to the latest released version and <em>unstable</em> "
-"refers to the developmental version. <em>non-US</em> is only available on "
-"some mirrors and refers to packages that contain encryption technology or "
-"other things that cannot be exported from the United States. Importing these "
-"packages into the US is legal however."
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental "
+"version. <emphasis>non-US</emphasis> is only available on some mirrors and "
+"refers to packages that contain encryption technology or other things that "
+"cannot be exported from the United States. Importing these packages into the "
+"US is legal however."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -6345,25 +6372,25 @@ msgid ""
 "restrictions placed on their use and distribution."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
-"update</tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -6371,57 +6398,63 @@ msgid ""
 "them together."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
 "have been successfully installed. To change this behavior place "
-"<tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"Both that APT <command>dselect</command> method and "
+"<command>apt-get</command> share the same interface. It is a simple system "
+"that generally tells you what it will do and then goes and does "
+"it. <placeholder type=\"footnote\" id=\"0\"/> After printing out a summary "
+"of what will happen APT then will print out some informative status messages "
+"so that you can estimate how far along it is and how much is left to do."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:280
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's "
-"state. At any time these operations can be performed by running <tt>apt-get "
-"check</tt>."
+"state. At any time these operations can be performed by running "
+"<literal>apt-get check</literal>."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is "
@@ -6429,17 +6462,17 @@ msgid ""
 "and a warning will be printed when apt-get exits."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -6449,18 +6482,18 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -6469,61 +6502,69 @@ msgid ""
 "problem is also included."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken "
-"packages</p></footnote>. The second is if a package installation fails "
-"during an operation. In this situation a package may have been unpacked "
-"without its dependents being installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:351
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
 msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the "
+"<literal>-f</literal> option and any other relevant activities to the "
+"command being executed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -6531,135 +6572,135 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken "
-"off. The <tt>-f</tt> option is especially good at generating packages to "
-"remove so extreme care should be used in that case. The list may contain "
-"packages that are going to be removed because they are only partially "
-"installed, possibly due to an aborted installation."
+"off. The <literal>-f</literal> option is especially good at generating "
+"packages to remove so extreme care should be used in that case. The list may "
+"contain packages that are going to be removed because they are only "
+"partially installed, possibly due to an aborted installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be "
 "changed. This should only happen during dist-upgrade or install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not "
 "upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -6676,27 +6717,27 @@ msgid ""
 "indicate the amount of space that will be freed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -6706,111 +6747,107 @@ msgid ""
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
 "Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history "
-"lines. The next word is the short form name of the object being "
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
 "downloaded. For archives it will contain the name of the package that is "
 "being fetched."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is "
+"expected. The total size is always shown in 4 figure notation to preserve "
+"space. After the size display is a percent meter for the file itself. The "
+"second last element is the instantaneous average speed. This values is "
+"updated every 5 seconds and reflects the rate of data transfer for that "
+"period. Finally is shown the estimated transfer time. This is updated "
 "regularly and reflects the time to complete everything at the shown transfer "
 "rate."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:542
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
 msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is "
-"completed. <prgn>dpkg</prgn> will also ask a number of questions as it "
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is "
+"completed. <command>dpkg</command> will also ask a number of questions as it "
 "processes the packages and the packages themselves may also ask several "
 "questions. Before each question there is usually a description of what it is "
 "asking and the questions are too varied to discuss completely here."
 msgstr ""
 
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr ""
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid "<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -6818,8 +6855,8 @@ msgid ""
 "fast connection but they are physically distant."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -6827,13 +6864,13 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote "
+"host</emphasis> mean the machine downloading the packages, and "
+"<emphasis>target host</emphasis> the one with bad or no connection."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -6841,13 +6878,13 @@ msgid ""
 "names such as ext2, fat32 or vfat."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -6855,8 +6892,8 @@ msgid ""
 "to download. The disk directory structure should look like:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -6866,34 +6903,35 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of "
+"<emphasis>/var/lib/dpkg/status</emphasis> from the <emphasis>target "
+"host</emphasis>. Please note, if you are using a local archive you must use "
+"copy URIs, the syntax is identical to file URIs."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -6902,10 +6940,10 @@ msgid ""
 "tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -6916,76 +6954,79 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in "
+"<emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
 "On the target machine the first thing to do is mount the disc and copy "
-"<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
-"directories outlined in the Overview, <em>archives/partial/</em> and "
-"<em>lists/partial/</em>. Then take the disc to the remote machine and "
-"configure the sources.list. On the remote machine execute the following:"
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, "
+"<emphasis>archives/partial/</emphasis> and "
+"<emphasis>lists/partial/</emphasis>. Then take the disc to the remote "
+"machine and configure the sources.list. On the remote machine execute the "
+"following:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:142
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying "
 "disc/status to /var/lib/dpkg/status so that any selections you made on the "
@@ -6994,21 +7035,21 @@ msgid ""
 "NOT copy the status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -7016,37 +7057,37 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are "
 "required. We merely use the standard APT commands to generate the file list."
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including "
 "dselect-upgrade."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -7054,34 +7095,34 @@ msgid ""
 "output on the disc."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index c336f638c..b2cff7770 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1,14 +1,14 @@
-# Translation of apt-doc to German
+# Translation of apt/doc to German
 # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
-# This file is distributed under the same license as the apt-doc package.
+# This file is distributed under the same license as the apt package.
 # Chris Leick <c.leick@vollbio.de>, 2009-2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.16\n"
+"Project-Id-Version: apt-doc 1.0.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-04 00:34+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,82 +615,90 @@ msgid ""
 msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: 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
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: 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
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
-msgstr ""
+msgstr "Befehlszeilenschnittstelle"
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Beschreibung"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 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 ""
+"<command>apt</command> (Advanced Package Tool) ist das Befehlszeilenwerkzeug "
+"für den Umgang mit Paketen. Es stellt eine Befehlszeilenschnittstelle zur "
+"Verwaltung von Paketen auf dem System bereit. Tiefer ansetzende "
+"Befehlsoptionen finden sie unter &apt-get; und &apt-cache;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 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 ""
+"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
+"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
+"folgenden Optionen werden unterstützt: <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--all-versions</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
+"<literal>search</literal> sucht nach angegebenen Begriffen und zeigt "
+"passende Pakete an."
 
 #. 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."
+#: apt.8.xml:60
 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."
+"<literal>show</literal> zeigt die Paketinformationen für die angegebenen "
+"Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
+"<literal>install</literal> wird ergänzt mit einem oder mehreren Paketnamen, "
+"von denen eine Installation oder ein Upgrade gewünscht wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -708,7 +716,7 @@ msgstr ""
 "ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -717,62 +725,73 @@ msgid ""
 "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, "
+"der Ausnahme, dass Pakete 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
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
+"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer »sources."
+"list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit."
 
 #. 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."
+#: apt.8.xml:95
 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."
+"<literal>update</literal> wird benutzt, um die Paketindexdateien wieder mit "
+"ihren Quellen in Einklang zu bringen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
+#, fuzzy
+#| 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."
 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."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
+"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller "
+"derzeit auf Ihrem System installierten Pakete von den in <filename>/etc/apt/"
+"sources.list</filename> aufgezählten Quellen zu installieren. Dabei werden "
+"neue Pakete installiert, existierende jedoch nicht entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 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 ""
+"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann "
+"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines "
+"Paketkonflikts nötig ist."
 
 #. 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
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "Optionen"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
-msgstr ""
+msgstr "Skriptaufruf"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 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 "
@@ -780,101 +799,98 @@ msgid ""
 "&apt-cache; and &apt-get; via APT options. Please prefer using these "
 "commands in your scripts."
 msgstr ""
+"Die &apt;-Befehlszeile wurde als Endanwenderwerkzeug entworfen und kann bei "
+"Versionswechseln die Ausgabe ändern. Obwohl es versucht, nicht die "
+"Abwärtskompatibilität zu unterbrechen, kann sie nicht garantiert werden. "
+"Alle Funktionalitäten von &apt; sind in &apt-cache; und &apt-get; über APT-"
+"Optionen verfügbar. Bitte benutzen Sie vorzugsweise diese Befehle in Ihren "
+"Skripten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "Unterschiede zu &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 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 ""
+"Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die "
+"Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-"
+"get;. Daher unterscheiden sich einige Optionen:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
+#: apt.8.xml:147
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "die <literal>Package:</literal>-Zeile"
+msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
+#: apt.8.xml:151
 msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "die <literal>Component:</literal>-Zeile"
+msgstr "Die Option <literal>APT::Color</literal> ist aktiviert."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
+"Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist <literal>dpkg "
+"--list</literal> ähnlich."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+#: apt.8.xml:160
 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"
+msgstr ""
+"Bei der Option <literal>upgrade</literal> ist standardmäßig <literal>--with-"
+"new-pkgs</literal> aktiviert."
 
 #. 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
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 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."
+#: apt.8.xml:171
 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."
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, 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
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 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."
+#: apt.8.xml:177
 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."
+"<command>apt</command> gibt bei normalen Operationen 0 zurück, dezimal 100 "
+"bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 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
+#: apt-get.8.xml:35
 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 "
@@ -887,8 +903,8 @@ msgstr ""
 "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
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -897,7 +913,7 @@ msgstr ""
 "angegeben ist, muss einer der unten aufgeführten Befehle vorkommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -921,7 +937,7 @@ msgstr ""
 "Größe der Pakete nicht im voraus bekannt ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -947,7 +963,7 @@ msgstr ""
 "get</command> die neuen Versionen der verfügbaren Pakete kennt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -972,7 +988,7 @@ msgstr ""
 "überschreiben der allgemeinen Einstellungen für einzelne Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -989,7 +1005,7 @@ msgstr ""
 "Installieren von neuen Paketen)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -1020,7 +1036,7 @@ msgstr ""
 "get getroffen wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1029,7 +1045,7 @@ msgstr ""
 "durchführen und müssen mit Vorsicht gehandhabt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -1039,7 +1055,7 @@ msgid ""
 "you wish to upgrade, and if a newer version is available, it (and its "
 "dependencies, as described above) will be downloaded and installed."
 msgstr ""
-"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie Sie ein Upgrade "
+"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie ein Upgrade "
 "eines oder mehrerer bereits installierter Pakete durchführen möchten, ohne "
 "ein Upgrade aller Pakete, die Sie auf Ihrem System haben, durchzuführen. "
 "Anders als das Ziel von »upgrade«, das die neusten Versionen aller aktuell "
@@ -1050,7 +1066,7 @@ msgstr ""
 "heruntergeladen und installiert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1059,7 +1075,7 @@ msgstr ""
 "alternative Installationsrichtlinie für eigene Pakete zu erzeugen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -1079,7 +1095,7 @@ msgstr ""
 "Zeichen, um genauere reguläre Ausdruck zu erstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1090,7 +1106,7 @@ msgstr ""
 "Konfigurationsdateien werden mitgelöscht)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1110,7 +1126,7 @@ msgstr ""
 "wurde, wenn möglich."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1125,7 +1141,7 @@ msgstr ""
 "Versionen (zu alte/zu neue) oder überhaupt keine Quellpakete erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1140,7 +1156,7 @@ msgstr ""
 "angegeben ist, wird das Quellpaket nicht entpackt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -1156,7 +1172,7 @@ msgstr ""
 "literal>-Option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1168,7 +1184,7 @@ msgstr ""
 "heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1184,7 +1200,7 @@ msgstr ""
 "angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1193,7 +1209,7 @@ msgstr ""
 "Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1202,7 +1218,7 @@ msgstr ""
 "Verzeichnis herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1215,7 +1231,7 @@ msgstr ""
 "partial/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1235,7 +1251,7 @@ msgstr ""
 "sie auf »off« gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1246,7 +1262,7 @@ msgstr ""
 "erfüllen und die nicht mehr benötigt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1269,7 +1285,7 @@ msgstr ""
 "Befehl <option>install</option> angeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1278,7 +1294,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1287,7 +1303,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1297,7 +1313,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 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 "
@@ -1326,7 +1342,7 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1347,7 +1363,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1359,7 +1375,7 @@ msgstr ""
 "<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1379,7 +1395,7 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1390,7 +1406,7 @@ msgstr ""
 "<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1410,7 +1426,7 @@ msgstr ""
 "wissen, was sie tun."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1425,7 +1441,7 @@ msgstr ""
 "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1441,7 +1457,7 @@ msgstr ""
 "Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1450,7 +1466,7 @@ msgstr ""
 "Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1460,7 +1476,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1470,7 +1486,7 @@ msgstr ""
 "Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1487,7 +1503,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 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 "
@@ -1503,7 +1519,7 @@ msgstr ""
 "Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1512,7 +1528,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1526,7 +1542,7 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1546,7 +1562,7 @@ msgstr ""
 "wird.Konfigurationselement: <literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1560,7 +1576,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1574,7 +1590,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1589,7 +1605,7 @@ msgstr ""
 "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1611,7 +1627,7 @@ msgstr ""
 "Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 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. "
@@ -1624,7 +1640,7 @@ msgstr ""
 "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1633,7 +1649,7 @@ msgstr ""
 "Version haben. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 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 "
@@ -1651,7 +1667,7 @@ msgstr ""
 "Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1676,7 +1692,7 @@ msgstr ""
 "auch die &apt-preferences;-Handbuchseite."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1690,7 +1706,7 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1699,7 +1715,7 @@ msgstr ""
 "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1713,7 +1729,7 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 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 "
@@ -1732,7 +1748,7 @@ msgstr ""
 "Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 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</"
@@ -1744,7 +1760,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1753,7 +1769,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 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::"
@@ -1765,14 +1781,7 @@ msgstr ""
 
 # FIXME s/Item/Items/
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: 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>."
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1783,18 +1792,18 @@ msgstr ""
 "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn "
 "Pakete installiert beziehungsweise entfernt werden oder ein Upgrade "
 "durchgeführt wird. Informationen über eine maschinell auswertbare Version "
-"dieser Daten finden Sie in README.progress-reporting im Apt-doc-Verzeichnis. "
-"Konfigurationselemente: <literal>DpkgPM::Progress</literal> und "
-"<literal>Dpkg::Progress-Fancy</literal>."
+"dieser Daten finden Sie in README.progress-reporting im Verzeichnis apt/doc. "
+"Konfigurationselemente: <literal>Dpkg::Progress</literal> und <literal>Dpkg::"
+"Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Dateien"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1805,7 +1814,7 @@ msgstr ""
 "das APT-Howto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1814,12 +1823,12 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "den APT-Zwischenspeicher abfragen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1832,7 +1841,7 @@ msgstr ""
 "und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1842,14 +1851,14 @@ msgstr ""
 "benötigen, falls er fehlt oder veraltet ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1873,7 +1882,7 @@ msgstr ""
 "Ausgabe ähnlich der folgenden erzeugen:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1899,7 +1908,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -1917,7 +1926,7 @@ msgstr ""
 "restlichen Ausgabe ist es am besten, den apt-Quelltext zu konsultieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1926,7 +1935,7 @@ msgstr ""
 "Es werden keine weiteren Argumente erwartet. Berichtete Statistiken sind:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1935,7 +1944,7 @@ msgstr ""
 "Zwischenspeicher gefundenen Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1949,7 +1958,7 @@ msgstr ""
 "Kategorie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -1966,7 +1975,7 @@ msgstr ""
 "bereit, aber es gibt kein Paket mit dem Namen »mail-transport-agent«."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -1979,7 +1988,7 @@ msgstr ""
 "aber nur ein Paket, xless, stellt »X11-text-viewer« bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1992,7 +2001,7 @@ msgstr ""
 "tatsächliches Paket, wird aber auch vom Paket debconf-tiny bereitgestellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2008,7 +2017,7 @@ msgstr ""
 "Breaks-Angaben Bezug genommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -2024,7 +2033,7 @@ msgstr ""
 "Paketnamen sein."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2033,7 +2042,7 @@ msgstr ""
 "Abhängigkeitsbeziehungen, den alle Pakete im Zwischenspeicher beanspruchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2044,7 +2053,7 @@ msgstr ""
 "wie alle Datensätze, die den Namen für ein Binärpaket deklarieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2053,7 +2062,7 @@ msgstr ""
 "im Zwischenspeicher. Es dient in erster Linie der Fehlersuche."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2063,7 +2072,7 @@ msgstr ""
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2072,7 +2081,7 @@ msgstr ""
 "Abhängigkeiten im Paketzwischenspeicher."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2082,12 +2091,12 @@ msgstr ""
 "Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2108,7 +2117,7 @@ msgstr ""
 "wird die lange Beschreibung nicht durchsucht, sondern nur der Paketname."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2117,7 +2126,7 @@ msgstr ""
 "die »und«-verknüpft werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2127,7 +2136,7 @@ msgstr ""
 "können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2136,12 +2145,12 @@ msgstr ""
 "Rückwärtsabhängigkeit, die ein Paket hat."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -2156,7 +2165,7 @@ msgstr ""
 "besten mit der <option>--generate</option>-Option benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -2167,7 +2176,7 @@ msgstr ""
 "Pakete sind z.B. auch in der generierten Liste aufgeführt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2189,7 +2198,7 @@ msgstr ""
 "GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2203,14 +2212,14 @@ msgstr ""
 "depends, grüne Linien sind Konflikte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch "
 "darstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2220,12 +2229,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -2238,7 +2247,7 @@ msgstr ""
 "Informationen über die Prioritätenauswahl der genannten Pakete aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -2257,7 +2266,7 @@ msgstr ""
 "(<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2269,7 +2278,7 @@ msgstr ""
 "pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2286,7 +2295,7 @@ msgstr ""
 "srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2300,7 +2309,7 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2312,7 +2321,7 @@ msgstr ""
 "<literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2328,7 +2337,7 @@ msgstr ""
 "Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2337,7 +2346,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2354,7 +2363,7 @@ msgstr ""
 "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2366,7 +2375,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2375,7 +2384,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2386,7 +2395,7 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2397,7 +2406,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2408,12 +2417,12 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2422,12 +2431,12 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "APT-Schlüsselverwaltungsdienstprogramm"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -2439,12 +2448,12 @@ msgstr ""
 "vertrauenswürdig betrachtet."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Befehle"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2455,33 +2464,33 @@ msgstr ""
 "Dateiname <literal>-</literal> ist, von der Standardeingabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 "entfernt einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "gibt den Schlüssel &synopsis-param-keyid; auf der Standardausgabe aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "gibt alle vertrauenswürdigen Schlüssel auf der Standardausgabe aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "listet vertrauenswürdige Schlüssel auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "listet Fingerabdrücke vertrauenswürdiger Schlüssel auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2490,7 +2499,7 @@ msgstr ""
 "öffentlichen Schlüssel herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2504,7 +2513,7 @@ msgstr ""
 "package; in &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2522,12 +2531,12 @@ msgstr ""
 "Ubuntu funktioniert dies aber."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Optionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2536,7 +2545,7 @@ msgstr ""
 "Befehlen definiert sein müssen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2553,52 +2562,52 @@ msgstr ""
 "Schlüssel werden zu diesem hinzugefügt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr ""
 "Schlüsselbund vertrauenswürdiger Schlüssel des &keyring-distro;-Archivs"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des &keyring-distro;-"
 "Archivs"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 "ein Paket als automatisch installiert markieren oder diese Markierung "
 "entfernen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2607,7 +2616,7 @@ msgstr ""
 "installiert markiert ist."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -2623,7 +2632,7 @@ msgstr ""
 "<command>aptitude</command> entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2634,7 +2643,7 @@ msgstr ""
 "keine manuell installierten Pakete von ihm abhängen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2645,7 +2654,7 @@ msgstr ""
 "kein anderes Paket von ihm abhängt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2661,7 +2670,7 @@ msgstr ""
 "option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2670,7 +2679,7 @@ msgstr ""
 "ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2684,7 +2693,7 @@ msgstr ""
 "die automatisch installiert wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2695,7 +2704,7 @@ msgstr ""
 "stattdessen eine Liste manuell installierter Pakete ausgibt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2704,7 +2713,7 @@ msgstr ""
 "Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2717,7 +2726,7 @@ msgstr ""
 "<literal>Dir::State</literal> definierten Verzeichnis, ist."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2726,12 +2735,12 @@ msgstr ""
 "Fehlern nicht Null."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "Archivauthentifizierungsunterstützung für APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -2744,7 +2753,7 @@ msgstr ""
 "auf den Signierschlüssel der Release-Datei haben."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 msgid ""
 "If a package comes from a archive without a signature, or with a signature "
 "that apt does not have a key for, that package is considered untrusted, and "
@@ -2760,7 +2769,7 @@ msgstr ""
 "dem Herunterladen von Paketen von dort erzwingen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2769,12 +2778,12 @@ msgstr ""
 "neue Authentifizierungsfunktion."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Vertrauenswürdige Archive"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2792,7 +2801,7 @@ msgstr ""
 "sicherstellt."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2805,7 +2814,7 @@ msgstr ""
 "(bereitgestellt von den Paketen debsig-verify beziehungsweise devscripts)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. In order to become "
@@ -2823,7 +2832,7 @@ msgstr ""
 "sicherzustellen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2844,7 +2853,7 @@ msgstr ""
 "Archivschlüsselbund im Paket &keyring-package; verfügbar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2856,7 +2865,7 @@ msgstr ""
 "dies automatisch tut."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2865,7 +2874,7 @@ msgstr ""
 "ist. Es wurde entworfen, um zwei mögliche Angriffe zu verhindern:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2881,7 +2890,7 @@ msgstr ""
 "oder DNS-Manipulationsangriffe) erfolgen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2894,7 +2903,7 @@ msgstr ""
 "Pakete von diesem Rechner herunterladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2907,12 +2916,12 @@ msgstr ""
 "Fall kann dieser Mechanismus eine Signatur pro Paket ergänzen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Benutzerkonfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys, although an installation of "
@@ -2926,7 +2935,7 @@ msgstr ""
 "den Debian-Paketdepots benutzt werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2944,12 +2953,12 @@ msgstr ""
 "herunterladen und prüfen kann."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Archivkonfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2958,7 +2967,7 @@ msgstr ""
 "stellen möchten, müssen Sie:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2969,7 +2978,7 @@ msgstr ""
 "<command>apt-ftparchive release</command> (aus apt-utils) ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2980,7 +2989,7 @@ msgstr ""
 "abs -o Release.gpg Release</command> ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2991,7 +3000,7 @@ msgstr ""
 "Dateien im Archiv zu authentifizieren."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3002,16 +3011,16 @@ msgstr ""
 "Schritten folgen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3028,12 +3037,12 @@ msgstr ""
 ">Strong Distribution HOWTO</ulink> von V. Alex Brennen lesen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Autoren der Handbuchseite"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -3042,12 +3051,12 @@ msgstr ""
 "Peña, Isaac Jones, Colin Walters, Florian Weimer und Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "APT-CD-ROM-Verwaltungswerkzeug"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3060,7 +3069,7 @@ msgstr ""
 "mehrere mögliche Fehlbrennungen und prüft die Indexdateien."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -3072,7 +3081,7 @@ msgstr ""
 "gescannt werden, um auf mögliche Fehlbrennungen zu testen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3087,7 +3096,7 @@ msgstr ""
 "Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3098,7 +3107,7 @@ msgstr ""
 "<filename>&statedir;/cdroms.list</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3107,7 +3116,7 @@ msgstr ""
 "gespeicherten Dateinamen zu berichten"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
@@ -3118,7 +3127,7 @@ msgstr ""
 "Konfigurationselement: <literal>Acquire::cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 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.  "
@@ -3130,7 +3139,7 @@ msgstr ""
 "cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3142,7 +3151,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3153,7 +3162,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3166,7 +3175,7 @@ msgstr ""
 "festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3177,7 +3186,7 @@ msgstr ""
 "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3188,12 +3197,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3202,12 +3211,12 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "APT-Konfigurationsabfrageprogramm"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3221,7 +3230,7 @@ msgstr ""
 "Anwendungen zu benutzen ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -3237,7 +3246,7 @@ msgstr ""
 "sollte es wie folgt benutzt werden:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3249,7 +3258,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3258,7 +3267,7 @@ msgstr ""
 "mit einer Vorgabe von <option>-f</option> setzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -3270,12 +3279,12 @@ msgstr ""
 "intern geprüft."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3284,12 +3293,12 @@ msgstr ""
 "benutzen Sie daher --no-empty, um sie aus der Ausgabe zu entfernen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3308,13 +3317,13 @@ msgstr ""
 "&percnt; kann mittels &percnt;&percnt; ausgegeben werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3323,27 +3332,27 @@ msgstr ""
 "dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "ursprüngliche Dokumentation von Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "Konfigurationsdatei für APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3357,7 +3366,7 @@ msgstr ""
 "Umgebung bereitzustellen."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3366,7 +3375,7 @@ msgstr ""
 "folgenden Reihenfolge lesen:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3375,7 +3384,7 @@ msgstr ""
 "angegeben wird (falls gesetzt)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3395,7 +3404,7 @@ msgstr ""
 "sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3403,7 +3412,7 @@ msgstr ""
 "angegeben wird"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3412,12 +3421,12 @@ msgstr ""
 "zu überschreiben oder um sogar mehrere Konfigurationsdateien zu laden."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Syntax"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3432,7 +3441,7 @@ msgstr ""
 "das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3459,7 +3468,7 @@ msgstr ""
 "werden, wie:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3477,7 +3486,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -3490,13 +3499,13 @@ msgstr ""
 "eingefügt werden, jeweils getrennt durch einen Schrägstrich."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3505,7 +3514,7 @@ msgstr ""
 "gute Anleitung, wie dies aussehen könnte."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3515,7 +3524,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal> benutzen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3531,7 +3540,7 @@ msgstr ""
 "überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3551,7 +3560,7 @@ msgstr ""
 "(Beachten Sie, dass diese Zeilen auch mit einem Schrägstrich enden müssen.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3568,7 +3577,7 @@ msgstr ""
 "nicht außer Kraft gesetzt, sondern nur bereinigt werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3588,7 +3597,7 @@ msgstr ""
 "Befehlszeile benutzt werden.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3620,12 +3629,12 @@ msgstr ""
 "beklagt."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "Die APT-Gruppe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3634,7 +3643,7 @@ msgstr ""
 "wie es die Optionen für alle Werkzeuge enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3645,7 +3654,7 @@ msgstr ""
 "die Architektur für die APT kompiliert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3667,7 +3676,7 @@ msgstr ""
 "print-architectures</command> registriert werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3681,7 +3690,7 @@ msgstr ""
 "außer Kraft."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3694,7 +3703,7 @@ msgstr ""
 "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3703,7 +3712,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:201
+#: apt.conf.5.xml:195
 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 "
@@ -3718,7 +3727,7 @@ msgstr ""
 "Möglichkeiten bereitstellt, um sie erneut zu installieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 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 "
@@ -3746,7 +3755,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:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3776,7 +3785,7 @@ msgstr ""
 "Stelle verhindern kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 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 "
@@ -3794,7 +3803,7 @@ msgstr ""
 "des Upgrade-Prozesses arbeiten können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 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 "
@@ -3816,7 +3825,7 @@ msgstr ""
 "davon abhängt, sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 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 "
@@ -3853,13 +3862,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:273
+#: apt.conf.5.xml:267
 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:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3869,7 +3878,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3879,7 +3888,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3889,12 +3898,12 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "Die Erwerbgruppe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3905,7 +3914,7 @@ msgstr ""
 "Herunterladen selbst zuständig sind (siehe auch &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3927,7 +3936,7 @@ msgstr ""
 "ValidTime</literal> unten benutzt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3946,7 +3955,7 @@ msgstr ""
 "Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3966,7 +3975,7 @@ msgstr ""
 "Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3977,7 +3986,7 @@ msgstr ""
 "der kompletten Dateien. Vorgabe ist True."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 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 "
@@ -3995,7 +4004,7 @@ msgstr ""
 "komplette Datei anstelle der Patche heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4011,7 +4020,7 @@ msgstr ""
 "URI-Art geöffnet wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4020,7 +4029,7 @@ msgstr ""
 "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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."
@@ -4030,7 +4039,7 @@ msgstr ""
 "kopiert zu werden. True ist die Vorgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 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]/</"
@@ -4049,7 +4058,7 @@ msgstr ""
 "wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 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 "
@@ -4070,7 +4079,7 @@ msgstr ""
 "Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 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."
@@ -4080,7 +4089,7 @@ msgstr ""
 "Datenzeitüberschreitungen angewandt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 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."
@@ -4100,7 +4109,7 @@ msgstr ""
 "HTTP/1.1-Spezifikation entsprechen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4109,7 +4118,7 @@ msgstr ""
 "folgen wird, was standardmäßig aktiviert ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4125,7 +4134,7 @@ msgstr ""
 "Zeit deaktiviert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4137,7 +4146,7 @@ msgstr ""
 "bekannten Bezeichner verwendet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 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 "
@@ -4160,7 +4169,7 @@ msgstr ""
 "dem veralteten Optionsnamen <literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4177,7 +4186,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4218,7 +4227,7 @@ msgstr ""
 "Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 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]/</"
@@ -4253,7 +4262,7 @@ msgstr ""
 "literal> und <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4270,7 +4279,7 @@ msgstr ""
 "Musterkonfigurationsdatei)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 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 "
@@ -4284,7 +4293,7 @@ msgstr ""
 "Effizienz nicht empfohlen FTP über HTTP zu benutzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4300,13 +4309,13 @@ msgstr ""
 "Server RFC2428 unterstützen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4328,7 +4337,7 @@ msgstr ""
 "Aushängebefehle können per UMount angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4337,13 +4346,13 @@ msgstr ""
 "literal>, um zusätzliche Parameter an Gpgv weiterzuleiten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, 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:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4363,19 +4372,19 @@ msgstr ""
 "\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, 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:531
+#: apt.conf.5.xml:525
 #, 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:524
+#: apt.conf.5.xml:518
 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 "
@@ -4407,13 +4416,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:538
+#: apt.conf.5.xml:532
 #, 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:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4439,7 +4448,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:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4451,7 +4460,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:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4465,7 +4474,7 @@ msgstr ""
 "False."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4485,13 +4494,13 @@ msgstr ""
 "langen Sprachcodes selten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, 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:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4532,7 +4541,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4546,22 +4555,22 @@ msgstr ""
 "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 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:591
+#: apt.conf.5.xml:585
 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:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "Verzeichnisse"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4581,16 +4590,28 @@ msgstr ""
 "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> enthält Orte, die zu lokalen "
 "Zwischenspeicherinformationen gehören, so wie die beiden "
@@ -4604,7 +4625,7 @@ msgstr ""
 "Standardverzeichnis in <literal>Dir::Cache</literal> enthalten."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4619,7 +4640,7 @@ msgstr ""
 "Konfigurationsdatei erfolgt)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4631,7 +4652,7 @@ msgstr ""
 "geladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4649,7 +4670,7 @@ msgstr ""
 "Programms an."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4669,7 +4690,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4687,12 +4708,12 @@ msgstr ""
 "diese Muster verwandt werden."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4703,7 +4724,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4726,7 +4747,7 @@ msgstr ""
 "vor dem Herunterladen neuer Pakete durch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4735,7 +4756,7 @@ msgstr ""
 "übermittelt, wenn es für die Installationsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: 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 update phase."
@@ -4744,7 +4765,7 @@ msgstr ""
 "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4753,12 +4774,12 @@ msgstr ""
 "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "Wie APT &dpkg; aufruft"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4767,7 +4788,7 @@ msgstr ""
 "stehen im Abschnitt <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4778,7 +4799,7 @@ msgstr ""
 "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4792,7 +4813,7 @@ msgstr ""
 "APT abgebrochen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 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 "
@@ -4811,7 +4832,7 @@ msgstr ""
 "übergeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4824,7 +4845,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:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4842,7 +4863,7 @@ msgstr ""
 "bietet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4860,7 +4881,7 @@ msgstr ""
 "verwendeten Dateideskriptors als eine Bestätigung."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4869,7 +4890,7 @@ msgstr ""
 "die Vorgabe ist <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4879,12 +4900,12 @@ msgstr ""
 "Programme werden erstellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 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:752
+#: apt.conf.5.xml:747
 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 "
@@ -4911,7 +4932,7 @@ msgstr ""
 "Pakete konfiguriert werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4925,7 +4946,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4950,7 +4971,7 @@ msgstr ""
 "Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4973,7 +4994,7 @@ msgstr ""
 "anhängen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5003,7 +5024,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:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5022,7 +5043,7 @@ msgstr ""
 "deaktivieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5038,7 +5059,7 @@ msgstr ""
 "benötigt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5056,7 +5077,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 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 "
@@ -5080,12 +5101,12 @@ msgstr ""
 "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Periodische- und Archivoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5099,12 +5120,12 @@ msgstr ""
 "Dokumentation dieser Optionen zu erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "Fehlersuchoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5122,7 +5143,7 @@ msgstr ""
 "könnten es sein:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5133,7 +5154,7 @@ msgstr ""
 "getroffenen Entscheidungen ein."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5144,7 +5165,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:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5156,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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5165,12 +5186,12 @@ msgstr ""
 "Daten in CD-ROM-IDs aus."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 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:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5178,28 +5199,28 @@ msgstr ""
 "literal>-Quellen beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 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:918
+#: apt.conf.5.xml:913
 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:929
+#: apt.conf.5.xml:924
 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:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5208,7 +5229,7 @@ msgstr ""
 "mittels <literal>gpg</literal> beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5217,13 +5238,13 @@ msgstr ""
 "CD-ROMs gespeichert sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 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:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5232,7 +5253,7 @@ msgstr ""
 "Bibliotheken generiert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5243,7 +5264,7 @@ msgstr ""
 "ID für eine CD-ROM generiert wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5253,14 +5274,14 @@ msgstr ""
 "gleichen Zeit laufen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 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:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5269,7 +5290,7 @@ msgstr ""
 "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5278,7 +5299,7 @@ msgstr ""
 "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5288,7 +5309,7 @@ msgstr ""
 "werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5296,7 +5317,7 @@ msgstr ""
 "durchführen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5306,7 +5327,7 @@ msgstr ""
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5322,7 +5343,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5355,7 +5376,7 @@ msgstr ""
 "dem das Paket erscheint."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5365,7 +5386,7 @@ msgstr ""
 "sind, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5374,7 +5395,7 @@ msgstr ""
 "und alle während deren Auswertung gefundenen Fehler aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5384,7 +5405,7 @@ msgstr ""
 "soll."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5392,12 +5413,12 @@ msgstr ""
 "von &dpkg; ausgeführt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 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:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5407,7 +5428,7 @@ msgstr ""
 "aufgetreten ist)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5419,7 +5440,7 @@ msgstr ""
 "Marker</literal> beschrieben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5428,21 +5449,24 @@ msgstr ""
 "filename> gelesenen Anbieter aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 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 ""
+"zeigt die externen Befehle, die durch APT-Hooks aufgerufen werden. Dies "
+"schließt z.B. die Konfigurationsoptionen <literal>DPkg::{Pre,Post}-Invoke</"
+"literal> oder <literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Beispiele"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5452,17 +5476,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "Voreinstellungssteuerdatei für APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5475,7 +5499,7 @@ msgstr ""
 "Installation ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5497,7 +5521,7 @@ msgstr ""
 "Installation ausgewählt wird."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -5513,7 +5537,7 @@ msgstr ""
 "der Version."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -5537,7 +5561,7 @@ msgstr ""
 "nicht. Sind wurden gewarnt."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5559,24 +5583,24 @@ msgstr ""
 "diesem Fall wird sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "APTs Standardprioritätszuweisungen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -5604,7 +5628,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
@@ -5614,12 +5638,12 @@ msgstr ""
 "Zuweisung:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "Priorität 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5632,12 +5656,12 @@ msgstr ""
 "<literal>experimental</literal> von Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "Priorität 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5651,12 +5675,12 @@ msgstr ""
 "backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "Priorität 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -5665,19 +5689,19 @@ msgstr ""
 "gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "Priorität 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
 "zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -5695,7 +5719,7 @@ msgstr ""
 "markiert sind."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5705,7 +5729,7 @@ msgstr ""
 "ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5721,12 +5745,12 @@ msgstr ""
 "Downgrading eines Paketes riskant sein kann.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "installiert die Version mit der höchsten Priorität."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5735,7 +5759,7 @@ msgstr ""
 "aktuellste installiert (das ist die mit der höheren Versionsnummer)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5747,7 +5771,7 @@ msgstr ""
 "installierte installiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5763,7 +5787,7 @@ msgstr ""
 "upgrade</command> ausgeführt wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5777,7 +5801,7 @@ msgstr ""
 "upgrade</command> ausgeführt wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5797,12 +5821,12 @@ msgstr ""
 "hat."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "Die Auswirkungen von APT-Einstellungen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5816,7 +5840,7 @@ msgstr ""
 "allgemeine Gestalt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5833,7 +5857,7 @@ msgstr ""
 "Pakete können durch Leerzeichen getrennt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5845,7 +5869,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -5860,7 +5884,7 @@ msgstr ""
 "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -5871,7 +5895,7 @@ msgstr ""
 "Paketversionen eine hohe Priorität zu, die lokal liegen."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5883,7 +5907,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -5897,7 +5921,7 @@ msgstr ""
 "de.debian.org« identifiziert wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5909,7 +5933,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5924,7 +5948,7 @@ msgstr ""
 "oder »Ximian«."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5935,7 +5959,7 @@ msgstr ""
 "Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5947,7 +5971,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5958,7 +5982,7 @@ msgstr ""
 "hohe Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5970,7 +5994,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5981,7 +6005,7 @@ msgstr ""
 "Nummer »<literal>&stable-version;</literal>« ist, eine hohe Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5993,12 +6017,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Reguläre Ausdrücke und &glob;-Syntax"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -6014,7 +6038,7 @@ msgstr ""
 "von Schrägstrichen umschlossen wird)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -6026,7 +6050,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6037,7 +6061,7 @@ msgstr ""
 "Paketen von einem Release seit Karmic die Priorität 900 zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6049,7 +6073,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6067,12 +6091,12 @@ msgstr ""
 "»Package«-Feld wird selbst nicht als ein &glob;-Ausdruck angesehen."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Wie APT Prioritäten interpretiert"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6082,12 +6106,12 @@ msgstr ""
 "(grob gesagt):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6096,12 +6120,12 @@ msgstr ""
 "des Pakets durchführt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6110,12 +6134,12 @@ msgstr ""
 "Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -6125,12 +6149,12 @@ msgstr ""
 "neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -6140,12 +6164,12 @@ msgstr ""
 "installierte Version neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -6154,17 +6178,17 @@ msgstr ""
 "installierte Version des Pakets gibt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "verhindert das Installieren der Version"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6178,7 +6202,7 @@ msgstr ""
 "erste dieser Datensätze die Priorität der Paketversion fest."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6187,7 +6211,7 @@ msgstr ""
 "bereits gezeigten Datensätze:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6215,12 +6239,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Dann:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -6235,7 +6259,7 @@ msgstr ""
 "perl;* ist, dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6246,7 +6270,7 @@ msgstr ""
 "sogar wenn diese Versionen zum Ziel-Release gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6260,12 +6284,12 @@ msgstr ""
 "Pakets installiert ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6276,7 +6300,7 @@ msgstr ""
 "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6295,27 +6319,27 @@ msgstr ""
 "Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "die <literal>Package:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "gibt den Paketnamen an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "die <literal>Version:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "gibt die Versionsnummer für das genannte Paket an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6337,12 +6361,12 @@ msgstr ""
 "APT-Prioritäten relevant:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6359,18 +6383,18 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "die <literal>Codename:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6387,13 +6411,13 @@ msgstr ""
 "anzugeben würde die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6410,7 +6434,7 @@ msgstr ""
 "eine der folgenden Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6422,12 +6446,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "die <literal>Component:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6445,18 +6469,18 @@ msgstr ""
 "Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "die <literal>Origin:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6468,18 +6492,18 @@ msgstr ""
 "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "die <literal>Label:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6492,13 +6516,13 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6524,12 +6548,12 @@ msgstr ""
 "Distribution heruntergeladen wurde."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6540,12 +6564,12 @@ msgstr ""
 "anfangen. Dieses stellt einen Platz für Kommentare bereit."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Stable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6569,7 +6593,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6584,8 +6608,8 @@ msgstr ""
 "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6597,7 +6621,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6610,13 +6634,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6630,12 +6654,12 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Testing oder Unstable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6663,7 +6687,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6680,7 +6704,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6693,13 +6717,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6719,12 +6743,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Die Entwicklung eines Codename-Releases verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6759,7 +6783,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6785,7 +6809,7 @@ msgstr ""
 "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6798,13 +6822,13 @@ msgstr ""
 "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6824,17 +6848,17 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "Liste konfigurierter APT-Datenquellen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6851,7 +6875,7 @@ msgstr ""
 "einer anderen APT-Oberfläche) beschafft."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6866,12 +6890,12 @@ msgstr ""
 "einer Zeile kennzeichnet den Rest dieser Zeile als Kommentar."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -6893,12 +6917,12 @@ msgstr ""
 "Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "Die Typen deb und deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6923,7 +6947,7 @@ msgstr ""
 "benötigt, um Quellindizes herunterzuladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6932,13 +6956,13 @@ msgstr ""
 "<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ Optionen ] URI Suite [Komponente1] [Komponente2] […]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6978,7 +7002,7 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
@@ -6987,7 +7011,7 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 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.  "
@@ -7008,7 +7032,7 @@ msgstr ""
 "muss mindestens eine <literal>Komponente</literal> angegeben sein."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7028,7 +7052,7 @@ msgstr ""
 "generieren."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 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 "
@@ -7057,7 +7081,7 @@ msgstr ""
 "hauszuhalten."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -7075,7 +7099,7 @@ msgstr ""
 "stillschweigend ignoriert werden."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7091,7 +7115,7 @@ msgstr ""
 "heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
@@ -7106,7 +7130,7 @@ msgstr ""
 "hinzuzufügen oder zu entfernen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -7124,7 +7148,7 @@ msgstr ""
 "korrekt authentifizierte Quellen als nicht authentifiziert."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -7138,12 +7162,12 @@ msgstr ""
 "Rechnern, zum Beispiel)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Einige Beispiele:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7155,17 +7179,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "URI-Beschreibung"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "Die derzeit zulässigen URI-Typen sind:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7176,7 +7200,7 @@ msgstr ""
 "lokale Spiegel oder Archive."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7186,7 +7210,7 @@ msgstr ""
 "der Quellenliste zu erstellen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7203,7 +7227,7 @@ msgstr ""
 "Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7225,7 +7249,7 @@ msgstr ""
 "benutzen, werden ignoriert."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -7238,7 +7262,7 @@ msgstr ""
 "Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7252,12 +7276,12 @@ msgstr ""
 "<command>find</command> und <command>dd</command> verwandt."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "weitere zulässige URI-Typen hinzufügen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7276,7 +7300,7 @@ msgstr ""
 "Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7285,37 +7309,37 @@ msgstr ""
 "jason/debian für stable/main, stable/contrib und stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "Quellzeile für obiges"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7326,7 +7350,7 @@ msgstr ""
 "<literal>amd64</literal> und <literal>armel</literal> holt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7336,7 +7360,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7345,13 +7369,13 @@ msgstr ""
 "den hamm/main-Bereich zu benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7361,13 +7385,13 @@ msgstr ""
 "benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7381,19 +7405,19 @@ msgstr ""
 "für beide Quellzeilen benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7413,17 +7437,17 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7432,7 +7456,7 @@ msgstr ""
 "und Schablonen von Debian-Paketen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7448,12 +7472,12 @@ msgstr ""
 "generiert:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "Paket Version Schablonendatei Konfigurationsskript"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7468,7 +7492,7 @@ msgstr ""
 "<filename>package.config.XXXXXX</filename> angegeben wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7479,7 +7503,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7488,12 +7512,12 @@ msgstr ""
 "zurück, dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "Werkzeug zum Sortieren von Paketindexdateien"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -7505,7 +7529,7 @@ msgstr ""
 "die internen Felder jedes Datensatzes gemäß interner Sortierregeln sortieren."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7513,7 +7537,7 @@ msgstr ""
 "durchsuchbare Datei sein."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7522,7 +7546,7 @@ msgstr ""
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7531,12 +7555,12 @@ msgstr ""
 "dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "Hilfsprogramm zum Generieren von Indexdateien"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -7549,7 +7573,7 @@ msgstr ""
 "Inhalts dieser Stelle generiert werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7563,7 +7587,7 @@ msgstr ""
 "für ein komplettes Archiv zu »skripten«."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -7579,7 +7603,7 @@ msgstr ""
 "Ausgabedateien erzeugt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7592,7 +7616,7 @@ msgstr ""
 "Befehl entspricht etwa &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7600,7 +7624,7 @@ msgstr ""
 "Zwischenspeichern von Programmen anzugeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7613,7 +7637,7 @@ msgstr ""
 "stdout ausgibt. Dieser Befehl entspricht etwa &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -7625,7 +7649,7 @@ msgstr ""
 "ändern."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7643,7 +7667,7 @@ msgstr ""
 "getrennt in der Ausgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7670,7 +7694,7 @@ msgstr ""
 "Prüfsumme enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7691,7 +7715,7 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -7707,7 +7731,7 @@ msgstr ""
 "Verwaltung der erforderlichen Einstellungen bereitstellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7717,12 +7741,12 @@ msgstr ""
 "Datensätze entfernt."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "Die Generate-Konfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7740,7 +7764,7 @@ msgstr ""
 "wenn die Markierung »scope« behandelt wird."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7748,12 +7772,12 @@ msgstr ""
 "unterhalb beschrieben"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "<literal>Dir</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7767,7 +7791,7 @@ msgstr ""
 "absoluten Pfad zu bilden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -7778,17 +7802,17 @@ msgstr ""
 "enthält."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "gibt den Ort der Override-Dateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "gibt den Ort der Zwischenspeicherdateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7797,12 +7821,12 @@ msgstr ""
 "unterhalb gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "<literal>Default</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7813,7 +7837,7 @@ msgstr ""
 "können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -7827,7 +7851,7 @@ msgstr ""
 "ist ». gzip«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7836,7 +7860,7 @@ msgstr ""
 "Vorgabe ist ».deb«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7845,7 +7869,7 @@ msgstr ""
 "Kompression der Quelldateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7854,7 +7878,7 @@ msgstr ""
 "Vorgabe ist ».dsc«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7863,7 +7887,7 @@ msgstr ""
 "Kompression der Inhaltsdateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7872,7 +7896,7 @@ msgstr ""
 "Kompression der Translation-en-Hauptdatei steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7883,7 +7907,7 @@ msgstr ""
 "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -7892,7 +7916,7 @@ msgstr ""
 "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7903,12 +7927,12 @@ msgstr ""
 "Hauptdatei unterteilt werden sollen"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "<literal>TreeDefault</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7919,7 +7943,7 @@ msgstr ""
 "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -7930,7 +7954,7 @@ msgstr ""
 "Tage alle neu gebildet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -7948,7 +7972,7 @@ msgstr ""
 "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7957,7 +7981,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7966,7 +7990,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7975,7 +7999,7 @@ msgstr ""
 "binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7984,7 +8008,7 @@ msgstr ""
 "source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7995,7 +8019,7 @@ msgstr ""
 "ist <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -8006,7 +8030,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -8021,12 +8045,12 @@ msgstr ""
 "automatisch integrieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr "setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8035,7 +8059,7 @@ msgstr ""
 "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8046,7 +8070,7 @@ msgstr ""
 "Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8059,12 +8083,12 @@ msgstr ""
 "benutzt, wenn Quellindizes verarbeitet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "<literal>Tree</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8079,7 +8103,7 @@ msgstr ""
 "<literal>Directory</literal>-Ersetzungsvariable definiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -8093,7 +8117,7 @@ msgstr ""
 "codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8104,7 +8128,7 @@ msgstr ""
 "Variablen benutzt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8118,7 +8142,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8129,7 +8153,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8140,7 +8164,7 @@ msgstr ""
 "non-free</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -8151,7 +8175,7 @@ msgstr ""
 "benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8160,7 +8184,7 @@ msgstr ""
 "Priorität und Adressinformationen des Betreuers."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8169,22 +8193,22 @@ msgstr ""
 "Abschnittsinformationen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "setzt die zusätzliche Programm-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "setzt die zusätzliche Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "<literal>BinDirectory</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8199,12 +8223,12 @@ msgstr ""
 "<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "setzt die Packages-Dateiausgabe"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8213,42 +8237,42 @@ msgstr ""
 "<literal>Sources</literal> ist erforderlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "setzt die Contents-Dateiausgabe (optional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "setzt die Programm-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "setzt die Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "setzt die Zwischenspeicherdatenbank"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "hängt einen Pfad an alle Ausgabepfade an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "gibt die Dateilistendatei an"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "Die Programm-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8263,19 +8287,19 @@ msgstr ""
 "und das letzte Feld ist das Betreuerumsetzungsfeld."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "alt [// oldn]* => neu"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "neu"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8292,12 +8316,12 @@ msgstr ""
 "bedingungslos."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "Die Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8308,12 +8332,12 @@ msgstr ""
 "Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "Die zusätzlich Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8325,7 +8349,7 @@ msgstr ""
 "ist der neue Wert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8350,7 +8374,7 @@ msgstr ""
 "literal> sein kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8360,7 +8384,7 @@ msgstr ""
 "DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -8374,7 +8398,7 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -8388,7 +8412,7 @@ msgstr ""
 "DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -8404,7 +8428,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8415,7 +8439,7 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8424,7 +8448,7 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8438,7 +8462,7 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8462,7 +8486,7 @@ msgstr ""
 "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8478,13 +8502,13 @@ msgstr ""
 "werden kann."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8494,7 +8518,7 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8502,36 +8526,53 @@ msgstr ""
 "<command>apt-ftparchive</command> gibt bei normalen Operationen 0 zurück, "
 "dezimal 100 bei Fehlern."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "de"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "APT-Benutzerhandbuch"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Dieses Dokument stellt eine Ãœbersicht bereit, wie das APT-"
 "Paketverwaltungsprogramm benutzt wird."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8543,8 +8584,8 @@ msgstr ""
 "sie von der Free Software Foundation veröffentlicht wird; entweder Version 2 "
 "der Lizenz oder (optional) jeder späteren Version."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8552,31 +8593,32 @@ msgstr ""
 "Siehe für weitere Details auf Debian-Systemen die Datei /usr/share/common-"
 "licenses/GPL, die die vollständige Lizenz enthält."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "Allgemein"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"Das Paket APT enthält derzeit zwei Abschnitte, die APT-<prgn>dselect</prgn>-"
-"Methode und die Anwenderschnittstelle <prgn>apt-get</prgn> für die "
-"Befehlszeile. Beide stellen eine Möglichkeit bereit, Pakete zu installieren, "
-"zu entfernen, sowie neue Pakete aus dem Internet herunterzuladen."
+"Das Paket APT enthält derzeit zwei Abschnitte, die APT-<command>dselect</"
+"command>-Methode und die Anwenderschnittstelle <command>apt-get</command> "
+"für die Befehlszeile. Beide stellen eine Möglichkeit bereit, Pakete zu "
+"installieren, zu entfernen, sowie neue Pakete aus dem Internet "
+"herunterzuladen."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Anatomie des Paketsystems"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8587,8 +8629,8 @@ msgstr ""
 "ordentlich und leicht in das System integriert wird. Das bekannteste seiner "
 "Funktionen ist das Abhängigkeitssystem."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8603,8 +8645,8 @@ msgstr ""
 "Durchschnittsanwender installieren sollte. Außerdem erlaubt es die Auswahl "
 "von Mail-Transport-Agenten, X-Servern und so weiter."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8617,8 +8659,8 @@ msgstr ""
 "benötigt, das zu gleichen Zeit installiert sein muss, um ordentlich zu "
 "funktionieren."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8631,8 +8673,8 @@ msgstr ""
 "eine Emacs-Erweiterung ist, hat es ebenfalls eine einfache Abhängigkeit von "
 "Emacs. Ohne Emacs ist es komplett unbenutzbar."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8654,8 +8696,8 @@ msgstr ""
 "in Konflikt stehende Abhängigkeiten mit allen anderen Mail-Transport-Agenten "
 "haben."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8676,8 +8718,8 @@ msgstr ""
 "dass sie von einem Mail-Transport-Agenten abhängen. Die kann zu großer "
 "Verwirrung führen, wenn manuell versucht wird, Pakete zu reparieren."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8690,77 +8732,85 @@ msgstr ""
 "Algorithmen bereitstellt, die bei der Auswahl von Paketen zur Installation "
 "helfen."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> stellt eine einfache Möglichkeit zu Verfügung, Pakete "
-"auf der Befehlszeile zu installieren. Anders als <prgn>dpkg</prgn> versteht "
-"<prgn>apt-get</prgn> keine .deb-Dateien. Es arbeitet mit dem Eigennamen des "
-"Pakets und kann .deb-Archive nur aus einer <em>Quelle</em> installieren."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"Das Erste <footnote><p>Falls Sie einen HTTP-Proxy-Server benutzen, müssen "
-"Sie zuerst die Umgebungsvariable »http_proxy« setzen, siehe sources.list(5)</"
-"p></footnote>, das Sie vor der Benutzung von <prgn>apt-get</prgn> tun "
-"sollten, ist es, die Paketlisten von der <em>Quelle</em> herunterzuladen, so "
-"dass es weiß, welche Pakete verfügbar sind. Dies wird mit <tt>apt-get "
-"update</tt> erledigt. Zum Beispiel,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> stellt eine einfache Möglichkeit zu Verfügung, "
+"Pakete auf der Befehlszeile zu installieren. Anders als <command>dpkg</"
+"command> versteht <command>apt-get</command> keine .deb-Dateien. Es arbeitet "
+"mit dem Eigennamen des Pakets und kann .deb-Archive nur aus einer "
+"<emphasis>Quelle</emphasis> installieren."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Falls Sie einen HTTP-Proxy-Server benutzen, müssen Sie zuerst die "
+"Umgebungsvariable »http_proxy« setzen, siehe sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"Das Erste <placeholder type=\"footnote\" id=\"0\"/>, das Sie vor der "
+"Benutzung von <command>apt-get</command> tun sollten, ist es, die "
+"Paketlisten von der <emphasis>Quelle</emphasis> herunterzuladen, so dass es "
+"weiß, welche Pakete verfügbar sind. Dies wird mit <literal>apt-get update</"
+"literal> erledigt. Zum Beispiel,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "OK   http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "OK   http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Paketlisten werden gelesen … Fertig\n"
-"Abhängigkeitsbaum wird aufgebaut … Fertig"
+"Abhängigkeitsbaum wird aufgebaut … Fertig\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr "Einmal aktualisiert stehen mehrere Befehl zur Benutzung zur Verfügung:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "»Upgrade« wird versuchen, ein behutsames Upgrade des ganzen Systems "
 "durchzuführen. »Upgrade« wird niemals ein neues Paket installieren oder "
@@ -8769,17 +8819,17 @@ msgstr ""
 "ein relativ sicheres Upgrade des Systems durchzuführen. »Upgrade« wird alle "
 "Pakete auflisten, von denen es kein Upgrade durchführen kann, was "
 "üblicherweise bedeutet, dass sie von neuen Paketen abhängen oder Konflikte "
-"mit anderen Paketen haben. <prgn>dselect</prgn> oder <tt>apt-get install</"
-"tt> können benutzt werden, um die Installation von diesen Paketen zu "
-"erzwingen."
+"mit anderen Paketen haben. <command>dselect</command> oder <literal>apt-get "
+"install</literal> können benutzt werden, um die Installation von diesen "
+"Paketen zu erzwingen."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8798,21 +8848,22 @@ msgstr ""
 "aufzulösen, wird eine Zusammenfassung ausgeben und nach einer Bestätigung "
 "fragen, wenn sich etwas anderes als dessen Argumente ändert."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "»Dist-upgrade« führt vollständige Upgrades durch. Es wurde entworfen, um "
 "Upgrades zwischen Releases von Debian zu vereinfachen. Es benutzt einen "
@@ -8820,13 +8871,13 @@ msgstr ""
 "Installieren, für das Upgrade oder zum Entfernen festzulegen, um soviel wie "
 "möglich vom System auf das neuste Release zu bekommen. In einigen "
 "Situationen könnte es eher gewünscht sein, »dist-upgrade« zu benutzen, als "
-"Zeit in das manuelle Auflösen von Abhängigkeiten in <prgn>dselect</prgn> zu "
-"investieren. Ist »Dist-upgrade« erst vollständig, dann kann <prgn>dselect</"
-"prgn> benutzt werden, um einige Pakete zu installieren, die außen vor "
-"geblieben sind."
+"Zeit in das manuelle Auflösen von Abhängigkeiten in <command>dselect</"
+"command> zu investieren. Ist »Dist-upgrade« erst vollständig, dann kann "
+"<command>dselect</command> benutzt werden, um einige Pakete zu installieren, "
+"die außen vor geblieben sind."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8834,168 +8885,167 @@ msgstr ""
 "Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine "
 "Entscheidungen können manchmal ziemlich überraschend sein."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, fuzzy
-#| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "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 "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed 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 used "
-"the downloaded archives can be installed by simply running the command that "
-"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 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 "
-"würde, wenn etwas schief läuft. Falls <tt>-d</tt> benutzt wird, können die "
-"heruntergeladenen Archive dadurch installiert werden, indem einfach der "
-"Befehl, der das Herunterladen veranlasste, erneut ohne <tt>-d</tt> ausführt "
-"wird."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+# s/package/packages/
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> 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 <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> hat mehrere Befehlszeilenoptionen, die sich "
+"detailliert in seiner Handbuchseite, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry> finden. Die "
+"nützlichste Option ist <literal>-d</literal>, 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 "
+"auch in dem Fall gestartet würde, dass etwas schief läuft. Falls <literal>-"
+"d</literal> benutzt wird, können die heruntergeladenen Archive dadurch "
+"installiert werden, indem einfach der Befehl, der das Herunterladen "
+"veranlasste, erneut ohne <literal>-d</literal> ausgeführt wird."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"Die APT-<prgn>dselect</prgn>-Methode stellt das komplette APT-System mit dem "
-"<prgn>dselect</prgn>-Paketauswahl-GUI bereit. <prgn>dselect</prgn> wird "
-"benutzt, um Pakete zum Installieren oder Entfernen auszuwählen und APT "
-"installiert sie tatsächlich."
+"Die APT-<command>dselect</command>-Methode stellt das komplette APT-System "
+"mit dem <command>dselect</command>-Paketauswahl-GUI bereit. "
+"<command>dselect</command> wird benutzt, um Pakete zum Installieren oder "
+"Entfernen auszuwählen und APT installiert sie tatsächlich."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
-"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <prgn>dselect</"
-"prgn> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
-"Zusammenstellung von <em>Quellen</em> gefragt. Dies sind Plätze, von denen "
-"Archive heruntergeladen werden. Dies können ferne Internetsites, lokale "
-"Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt des "
-"gesamten Debian-Archives bereitstellen. APT wird sie automatisch "
+"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <command>dselect</"
+"command> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
+"Zusammenstellung von <emphasis>Quellen</emphasis> gefragt. Dies sind Plätze, "
+"von denen Archive heruntergeladen werden. Dies können ferne Internetsites, "
+"lokale Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt "
+"des gesamten Debian-Archives bereitstellen. APT wird sie automatisch "
 "kombinieren, um eine komplette Zusammenstellung von Paketen zu formen. Falls "
 "Sie eine CD-ROM haben, ist es eine gute Idee, sie als erstes und dann den "
 "Spiegel anzugeben, so dass Sie Zugriff auf die neusten Fehlerbehebungen "
 "haben. APT wird automatisch Pakete auf der CD-ROM benutzen, bevor es sie aus "
 "dem Internet herunterlädt."
 
-#. type: <example></example>
-#: guide.sgml:198
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   eine Liste mit Orten von Distributionsquellen einrichten\n"
-"\t \n"
+"\n"
 " Bitte geben Sie die Basis-URL der Debian-Distribution an.\n"
 " Die bekannten Zugriffsschemata dafür sind: http file\n"
-"\t   \n"
+"\n"
 " Zum Beispiel:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"Das Einrichten der <em>Quellen</em> beginnt durch das Erfragen der Basis des "
-"Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes wird nach der "
-"zu erhaltenden Distribution gefragt."
+"Das Einrichten der <emphasis>Quellen</emphasis> beginnt durch das Erfragen "
+"der Basis des Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes "
+"wird nach der zu erhaltenden Distribution gefragt."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-msgstr ""
-" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit  einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind  normalerweise etwas wie: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"Die Distribution bezieht sich auf die Debian-Version im Archiv, <em>stable</"
-"em> bezieht sich auf die zuletzt veröffentlichte Version und <em>unstable</"
-"em> bezieht sich auf die Entwicklungsversion. <em>non-US</em> ist nur auf "
-"einigen Spiegeln verfügbar und bezieht sich auf Pakete, die "
+"\n"
+" Distribution [stable]:\n"
+msgstr ""
+" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit\n"
+" einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind\n"
+" normalerweise etwas wie: stable unstable testing non-US\n"
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"Die Distribution bezieht sich auf die Debian-Version im Archiv, "
+"<emphasis>stable</emphasis> bezieht sich auf die zuletzt veröffentlichte "
+"Version und <emphasis>unstable</emphasis> bezieht sich auf die "
+"Entwicklungsversion. <emphasis>non-US</emphasis> ist nur auf einigen "
+"Spiegeln verfügbar und bezieht sich auf Pakete, die "
 "Verschlüsselungstechnologie oder andere Dinge enthalten, die nicht aus den "
 "Vereinigten Staaten exportiert werden können. Diese Pakete in die USA zu "
 "importieren ist jedoch legal."
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Bitte geben Sie die Komponenten an, die Sie erhalten möchten\n"
 " Die Komponenten sind normalerweise etwas wie: »main« »contrib« »non-free«\n"
-"  \n"
-" Komponenten [main contrib non-free]:"
+"\n"
+" Komponenten [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -9008,8 +9058,8 @@ msgstr ""
 "»Contrib« und »Non-free« Dinge enthalten, die verschiedene Einschränkungen "
 "in ihrer Benutzung und ihren Vertrieb haben."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -9018,24 +9068,24 @@ msgstr ""
 "wird mit Nachfragen fortfahren, bis Sie alles angegeben haben, was Sie "
 "möchten."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die "
-"Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern "
-"auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das "
-"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. "
-"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get "
-"update</tt> ausgeführt wurde."
+"Bevor sie beginnen, <command>dselect</command> zu benutzen, ist es "
+"notwendig, die Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü "
+"[E]rneuern auswählen. Dies ist eine Obermenge von <literal>apt-get update</"
+"literal>, das <command>dselect</command> heruntergeladene Informationen zur "
+"Verfügung stellt. [E]rneuern muss auch dann durchgeführt werden, wenn vorher "
+"<literal>apt-get update</literal> ausgeführt wurde."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9047,76 +9097,84 @@ msgstr ""
 "benutzen, haben die Befehle Kon[f]ig. und [L]öschen keine Bedeutung, der "
 "Befehl [I]nstall. führt beides gleichermaßen aus."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Standardmäßig wird APT automatisch die Paketdateien (.deb) entfernen, sobald "
 "sie erfolgreich installiert sind. Um dieses Verhalten zu ändern, platzieren "
-"Sie <tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"Sie <literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "Die Schnittstelle"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"Die Methode <command>dselect</command> ist tatsächlich eine Zusammenstellung "
+"von Wrapper-Skripten für <command>apt-get</command>. Die Methode stellt "
+"tatsächlich mehr Funktionalitäten bereit, als in <command>apt-get</command> "
+"allein vorhanden sind."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Sowohl die APT-Methode <prgn>dselect</prgn>, als auch <prgn>apt-get</prgn> "
-"teilen sich die gleiche Schnittstelle. Es ist ein einfaches System, das "
-"üblicherweise mitteilt, was es tun wird und es dann tut. <footnote><p>Die "
-"Methode <prgn>dselect</prgn> ist tatsächlich eine Zusammenstellung von "
-"Wrapper-Skripten für <prgn>apt-get</prgn>. Die Methode stellt tatsächlich "
-"mehr Funktionalitäten bereit, als in <prgn>apt-get</prgn> allein vorhanden "
-"sind.</p></footnote> Nach der Ausgabe einer Zusammenfassung was passieren "
-"wird, gibt APT einige informative Statusmeldungen aus, so dass Sie "
-"abschätzen können, wie weit es ist und wieviel noch zu tun ist."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Sowohl die APT-Methode <command>dselect</command>, als auch <command>apt-"
+"get</command> teilen sich die gleiche Schnittstelle. Es ist ein einfaches "
+"System, das üblicherweise mitteilt, was es tun wird und es dann tut. "
+"<placeholder type=\"footnote\" id=\"0\"/> Nach der Ausgabe einer "
+"Zusammenfassung was passieren wird, gibt APT einige informative "
+"Statusmeldungen aus, so dass Sie abschätzen können, wie weit es ist und "
+"wieviel noch zu tun ist."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Anfang"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Vor allen Operationen, ausgenommen »update«, führt APT eine Reihe von "
 "Aktionen durch, um seinen internen Status vorzubereiten. Es macht außerdem "
 "einige Prüfungen des Systemstatus. Diese Operationen können jederzeit durch "
-"Ausführung von <tt>apt-get check</tt> durchgeführt werden."
+"Ausführung von <literal>apt-get check</literal> durchgeführt werden."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Paketlisten werden gelesen … Fertig\n"
-"Abhängigkeitsbaum wird aufgebaut … Fertig"
+"Abhängigkeitsbaum wird aufgebaut … Fertig\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9129,22 +9187,22 @@ msgstr ""
 "gefunden werden, werden sie ignoriert und beim Beenden von Apt-get wird eine "
 "Warnung ausgegeben."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "Die letzte Operation führt eine detaillierte Analyse der Abhängigkeiten des "
 "Systems durch. Sie prüft jede Abhängigkeit jedes installierten oder "
 "entpackten Pakets und berücksichtigt, ob es in Ordnung ist. Sollte sie ein "
-"Problem finden, dann wird eine Meldung ausgegeben und <prgn>apt-get</prgn> "
-"wird die Ausführung verweigern."
+"Problem finden, dann wird eine Meldung ausgegeben und <command>apt-get</"
+"command> wird die Ausführung verweigern."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9154,14 +9212,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Paketlisten werden gelesen … Fertig Fertig\n"
@@ -9171,17 +9229,17 @@ msgstr ""
 "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n"
 "  9fonts: Hängt ab: xlib6g ist aber nicht installiert\n"
 "  uucp: Hängt ab: mailx ist aber nicht installiert\n"
-"  blast: Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
+"  blast: Hängt ab: xlib6g (&gt;= 3.3-5) ist aber nicht installiert\n"
 "  adduser: Hängt ab: perl-base ist aber nicht installiert\n"
 "  aumix: Hängt ab: libgpmg1 ist aber nicht installiert\n"
 "  debiandoc-sgml: Hängt ab: sgml-base ist aber nicht installiert\n"
-"  bash-builtins: Hängt ab: bash (>= 2.01) but 2.0-3 ist installiert\n"
+"  bash-builtins: Hängt ab: bash (&gt;= 2.01) but 2.0-3 ist installiert\n"
 "  cthugha: Hängt ab: svgalibg1 ist aber nicht installiert\n"
-"           Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Hängt ab: xlib6g (&gt;= 3.3-5) ist aber nicht installiert\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9195,87 +9253,98 @@ msgstr ""
 "Problem anzeigt und die Abhängigkeiten, die nicht erfüllt sind. Eine kurze "
 "Erklärung, warum das Paket ein Abhängigkeitsproblem hat, ist inbegriffen."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"APT berücksichtigt jedoch alle bekannten Abhängigkeiten und versucht, "
+"kaputte Pakete zu vermeiden"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Es gibt zwei Möglichkeiten, wie ein System in einen kaputten Status wie "
-"diesen kommen kann. Die erste wird dadurch verursacht, dass <prgn>dpkg</"
-"prgn> einige feine Beziehungen zwischen Paketen übersieht, wenn Upgrades "
-"durchgeführt werden. <footnote><p>APT berücksichtigt jedoch alle bekannten "
-"Abhängigkeiten und versucht, kaputte Pakete zu vermeiden</p></footnote>. Die "
-"zweite tritt auf, falls eine Paketinstallation während der Ausführung "
-"fehlschlägt. In dieser Situation könnte ein Paket entpackt worden sein, ohne "
-"dass die von ihm Abhängigen installiert sind."
+"diesen kommen kann. Die erste wird dadurch verursacht, dass <command>dpkg</"
+"command> einige feine Beziehungen zwischen Paketen übersieht, wenn Upgrades "
+"durchgeführt werden. <placeholder type=\"footnote\" id=\"0\"/>. Die zweite "
+"tritt auf, falls eine Paketinstallation während der Ausführung fehlschlägt. "
+"In dieser Situation könnte ein Paket entpackt worden sein, ohne dass die von "
+"ihm Abhängigen installiert sind."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "Die zweite Situation ist weit weniger ernst als die erste, weil APT "
 "bestimmte Beschränkungen in der Reihenfolge setzt, in der Pakete installiert "
-"werden. In beiden Fällen veranlasst die Option <tt>-f</tt> <prgn>apt-get</"
-"prgn>, eine mögliche Lösung für das Problem zu folgern und dann "
-"fortzufahren. Die APT-Methode <prgn>dselect</prgn> liefert immer die Option "
-"<tt>-f</tt>, zum einfachen Fortfahren von gescheiterten Betreuerskripten."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Falls jedoch die Option <tt>-f</tt> benutzt wird, um ein ernsthaft kaputtes "
-"System zu korrigieren, das vom ersten Fall verursacht wurde, dann ist es "
-"möglich, dass es entweder sofort fehlschlägt oder die Installationsabfolge "
-"fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg (möglicherweise mit "
-"erzwingenden Optionen) manuell zu benutzen, um die Situation ausreichend zu "
-"korrigieren, so dass es APT ermöglicht wird, fortzufahren."
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"werden. In beiden Fällen veranlasst die Option <literal>-f</literal> "
+"<command>apt-get</command>, eine mögliche Lösung für das Problem zu folgern "
+"und dann fortzufahren. Die APT-Methode <command>dselect</command> liefert "
+"immer die Option <literal>-f</literal>, zum einfachen Fortfahren von "
+"gescheiterten Betreuerskripten."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Falls jedoch die Option <literal>-f</literal> benutzt wird, um ein ernsthaft "
+"kaputtes System zu korrigieren, das vom ersten Fall verursacht wurde, dann "
+"ist es möglich, dass es entweder sofort fehlschlägt oder die "
+"Installationsabfolge fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg "
+"(möglicherweise mit erzwingenden Optionen) manuell zu benutzen, um die "
+"Situation ausreichend zu korrigieren, so dass es APT ermöglicht wird, "
+"fortzufahren."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "Der Statusbericht"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
-"Bevor es fortfährt, wird <prgn>apt-get</prgn> einen Bericht darüber "
+"Bevor es fortfährt, wird <command>apt-get</command> einen Bericht darüber "
 "präsentieren, was geschehen wird. Im Allgemeinen spiegelt der Bericht den "
 "Typ der Operation, die ausgeführt wird, wider, aber es gibt auch mehrere "
 "geläufige Elemente. Auf jeden Fall spiegelt die Liste den Endstatus der "
-"Dinge wider, bezieht die Option <tt>-f</tt> in Betracht und alle andere "
-"relevante Aktivitäten zum Befehl, der ausgeführt wird."
+"Dinge wider, bezieht die Option <literal>-f</literal> in Betracht und alle "
+"andere relevante Aktivitäten zum Befehl, der ausgeführt wird."
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "Die zusätzliche Paketliste"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9283,87 +9352,87 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Die folgenden Pakete werden zusätzlich installiert:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "Die zusätzliche Paketliste zeigt alle Pakete, die installiert werden oder "
 "von denen ein Upgrade durchgeführt wird, zusätzlich zu den auf der "
-"Befehlszeile angegebenen. Sie wird nur für einen <tt>install</tt>-Befehl "
-"generiert. Die aufgelisteten Pakete sind häufig das Ergebnis einer "
+"Befehlszeile angegebenen. Sie wird nur für einen <literal>install</literal>-"
+"Befehl generiert. Die aufgelisteten Pakete sind häufig das Ergebnis einer "
 "automatischen Installation."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "Die zu entfernenden Pakete"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Die folgenden Pakete werden ENTFERNT:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "Die Liste der zu entfernenden Pakete zeigt all die Pakete, die vom System "
 "entfernt werden. Sie kann für jede der Operationen angezeigt werden und "
 "sollte einer sorgfältige Überprüfung unterzogen werden, um sicherzustellen, "
-"dass nichts Wichtiges weggenommen wird. Die Option <tt>-f</tt> ist "
+"dass nichts Wichtiges weggenommen wird. Die Option <literal>-f</literal> ist "
 "insbesondere gut darin, Pakete zum Entfernen vorzumerken, so dass in diesem "
 "Fall mit extremer Vorsicht vorgegangen werden sollte. Die Liste könnte "
 "Pakete enthalten, die entfernt werden, weil sie nur teilweise installiert "
 "sind, möglicherweise aufgrund einer abgebrochenen Installation."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "Die Liste neuer Pakete"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Die folgenden NEUEN Pakete werden zusätzlich installiert:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9373,58 +9442,58 @@ msgstr ""
 "aufgelisteten Pakete sind zurzeit nicht auf dem System installiert, werden "
 "es aber sein, wenn APT fertig ist."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "Die Liste zurückgehaltener Pakete"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Die folgenden Pakete werden zurückgehalten:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Jedesmal, wenn ein Upgrade des ganzen Systems durchgeführt wird, besteht die "
 "Möglichkeit, dass neue Versionen von Paketen nicht installiert werden "
 "können, weil sie neue Dinge benötigen oder einen Konflikt mit bereits "
 "installierten Dingen haben. In diesem Fall wird das Paket auf der Liste "
 "zurückgehaltener Pakete erscheinen. Der beste Weg dort aufgeführte Pakete "
-"zur Installation zu bewegen, ist per <tt>apt-get install</tt> oder indem "
-"<prgn>dselect</prgn> zum Lösen ihrer Probleme benutzt wird."
+"zur Installation zu bewegen, ist per <literal>apt-get install</literal> oder "
+"indem <command>dselect</command> zum Lösen ihrer Probleme benutzt wird."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "Warnung wegen zurückgehaltener Pakete"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Die folgenden zurückgehaltenen Pakete werden geändert:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9435,33 +9504,33 @@ msgstr ""
 "zurückgehaltene Paket geändert wird. Dies sollte nur während »Dist-upgrade« "
 "oder »Install« vorkommen."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Abschließende Zusammenfassung"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Abschließend wird APT eine Zusammenfassung aller Änderungen ausgeben, die "
 "auftreten werden."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 Pakete aktualisiert, 8 zusätzlich installiert, 23 werden entfernt und 51 nicht aktualisiert.\n"
 "12 Pakete nicht vollständig installiert oder entfernt.\n"
-"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden 26,5MB zusätzlich belegt sein."
+"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden 26,5MB zusätzlich belegt sein.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9491,8 +9560,8 @@ msgstr ""
 "Speicher nachdem alles erledigt ist. Wenn eine große Anzahl Pakete entfernt "
 "wird, dann kann der Wert den Betrag des freiwerdenden Speichers anzeigen."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9501,13 +9570,13 @@ msgstr ""
 "werden, um Pakete anzuzeigen, von denen ein Upgrade durchgeführt werden "
 "soll. Dies ist den vorherigen Beispielen ähnlich."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "Der Anzeigestatus"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9515,8 +9584,8 @@ msgstr ""
 "Während des Herunterladens von Archiven und Paketdateien gibt APT eine Reihe "
 "von Statusmeldungen aus."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9525,7 +9594,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Hole:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9533,69 +9602,71 @@ msgstr ""
 "Treffer http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Hole:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Hole:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Die Zeilen, die mit <em>Hole</em> beginnen, werden ausgegeben, wenn APT "
-"anfängt, eine Datei herunterzuladen, während die letzte Zeile den "
+"Die Zeilen, die mit <emphasis>Hole</emphasis> beginnen, werden ausgegeben, "
+"wenn APT anfängt, eine Datei herunterzuladen, während die letzte Zeile den "
 "Fortschritt des Herunterladens anzeigt. Die erste Prozentzahl der "
 "Fortschrittszeile zeigt die gesamt erledigte Prozentzahl aller Dateien an. "
-"Unglücklicherweise schätzt <tt>apt-get update</tt> die erledigte "
+"Unglücklicherweise schätzt <literal>apt-get update</literal> die erledigte "
 "Prozentzahl, da die Größe der Pakete unbekannt ist, was einige "
 "Ungenauigkeiten bewirkt."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "Der nächste Abschnitt der Statuszeile wird für jeden Download-Thread "
 "wiederholt und zeigt die durchgeführte Operation, sowie einige nützliche "
 "Informationen darüber an was geschieht. Manchmal wird dieser Abschnitt "
-"einfach nur <em>Forking</em> darstellen, was bedeutet, dass das "
+"einfach nur <emphasis>Forking</emphasis> darstellen, was bedeutet, dass das "
 "Betriebssystem das Download-Modul am Laden ist. Das erste Wort nach dem »[« "
 "ist die Ladenummer, wie sie auf den Verlaufszeilen angezeigt wird. Das "
 "nächste Wort ist Name in Kurzform des Ojektes, das heruntergeladen wird. Für "
 "Archive wird es den Namen des Paketes enthalten, das heruntergeladen wird."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "Innerhalb von einzelnen Anführungszeichen folgt eine informative "
 "Zeichenkette, die den Fortschritt der Ãœbertragungsphase des Downloads "
-"anzeigt. Normalerweise schreitet sie fort von <em>Verbinde</em> zu <em>Warte "
-"auf Datei</em> zu <em>Lade herunter</em> oder <em>Nehme wieder auf</em>. Der "
-"letzte Wert ist die Anzahl der von der fernen Site heruntergeladenen Bytes. "
-"Sobald der Download beginnt, zeigt sich dies wie <tt>102/10.2k</tt> was "
+"anzeigt. Normalerweise schreitet sie fort von <emphasis>Verbinde</emphasis> "
+"zu <emphasis>Warte auf Datei</emphasis> zu <emphasis>Lade herunter</"
+"emphasis> oder <emphasis>Nehme wieder auf</emphasis>. Der letzte Wert ist "
+"die Anzahl der von der fernen Site heruntergeladenen Bytes. Sobald der "
+"Download beginnt, zeigt sich dies wie <literal>102/10.2k</literal> was "
 "anzeigt, dass 102 Bytes heruntergeladen und 10,2 Kilobytes erwartet werden. "
 "Die Gesamtgröße wird immer in vierstelliger Schreibweise dargestellt, um "
 "Platz zu sparen. Nach der Größenanzeige ist eine Prozentangabe für die Datei "
@@ -9606,57 +9677,52 @@ msgstr ""
 "wird regelmäßig aktualisiert und spiegelt die Zeit zum Vervollständigen bei "
 "der angezeigten Datenübertragungsgeschwindigkeit wider."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "Die Statusanzeige aktualisiert sich alle halbe Sekunde, um eine gleichmäßige "
 "Rückmeldung über den Download-Fortschritt bereitzustellen, während die "
 "»Hole«-Zeilen bei jeder gestarteten neuen Datei zurückscrollen. Da die "
 "Statusanzeige ständig aktualisiert wird, ist sie für die Protokollierung in "
-"eine Datei ungeeignet. Benutzen Sie die Option <tt>-q</tt>, um die "
+"eine Datei ungeeignet. Benutzen Sie die Option <literal>-q</literal>, um die "
 "Statusanzeige zu entfernen."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT benutzt <prgn>dpkg</prgn>, um die Archive zu installieren und wird zu "
-"der <prgn>dpkg</prgn>-Schnittstelle herüberschalten, sobald der Download "
-"vollständig ist. <prgn>dpkg</prgn> wird außerdem eine Reihe von Fragen "
-"stellen, während es die Pakete abarbeitet und die Pakete können auch mehrere "
-"Fragen stellen . Vor jeder Frage ist üblicherweise eine Beschreibung des "
-"Gefragten und die Fragen sind zu vielfältig, um sie vollständig hier zu "
-"besprechen."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT benutzt <command>dpkg</command>, um die Archive zu installieren und wird "
+"zu der <command>dpkg</command>-Schnittstelle herüberschalten, sobald der "
+"Download vollständig ist. <command>dpkg</command> wird außerdem eine Reihe "
+"von Fragen stellen, während es die Pakete abarbeitet und die Pakete können "
+"auch mehrere Fragen stellen . Vor jeder Frage ist üblicherweise eine "
+"Beschreibung des Gefragten und die Fragen sind zu vielfältig, um sie "
+"vollständig hier zu besprechen."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "APT offline verwenden"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9665,23 +9731,25 @@ msgstr ""
 "speziell einem »Turnschuhnetzwerk«, an die Durchführung von Upgrades "
 "herangeht."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Einleitung"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Ãœbersicht"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9694,8 +9762,8 @@ msgstr ""
 "wie einem Modem, hängt und eine andere Maschine eine sehr schnelle "
 "Verbindung hat, sie jedoch physisch fern sind."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9703,9 +9771,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "Die Lösung dazu besteht darin, große Wechselmedien, wie eine Zip-Platte oder "
 "eine SuperDisk zu benutzen. Diese Platten sind nicht groß genug, um ein "
@@ -9716,11 +9784,11 @@ msgstr ""
 "herunterzuladen. Es ist sogar möglich, eine andere Debian-Maschine mit APT "
 "oder ein komplett unterschiedliches Betriebssystem und ein Download-Werkzeug "
 "wie Wget zu benutzen. Nennen wir die Maschine, die die Pakete herunterlädt "
-"<em>ferner Rechner</em> und die mit der schlechten oder fehlenden Verbindung "
-"<em>Zielrechner</em>."
+"<emphasis>ferner Rechner</emphasis> und die mit der schlechten oder "
+"fehlenden Verbindung <emphasis>Zielrechner</emphasis>."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9733,13 +9801,13 @@ msgstr ""
 "Platte mit einem Dateisystem formatiert sein sollte, das mit langen "
 "Dateinamen umgehen kann, so wie ext2, fat32 oder vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "APT auf beiden Maschinen benutzen"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9752,8 +9820,8 @@ msgstr ""
 "Paketdateien herunterzuladen und zu entscheiden, welche Pakete "
 "heruntergeladen werden. Die Plattenverzeichnisstruktur sollte so aussehen:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9763,7 +9831,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /Platte/\n"
 "    Archive/\n"
@@ -9772,42 +9840,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "Die Konfigurationsdatei"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Die Konfigurationsdatei sollte APT mitteilen, dass es seine Dateien auf der "
 "Platte speichert und obendrein die Konfigurationsdateien auf der Platte "
 "benutzt. Die »sources.list« sollte genau die Sites enthalten, die Sie auf "
 "der fernen Maschine benutzen möchten und die Statusdatei sollte eine Kopie "
-"von <em>/var/lib/dpkg/status</em> vom <em>Zielrechner</em> sein. Bitte "
-"beachten Sie, falls Sie lokale Archive benutzen, dass Sie »copy«-URIs "
-"benutzen müssen. Die Syntax entspricht der von »file«-URIs."
+"von <emphasis>/var/lib/dpkg/status</emphasis> vom <emphasis>Zielrechner</"
+"emphasis> sein. Bitte beachten Sie, falls Sie lokale Archive benutzen, dass "
+"Sie »copy«-URIs benutzen müssen. Die Syntax entspricht der von »file«-URIs."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> muss die nötigen Informationen enthalten, damit APT die "
-"Platte benutzt:"
+"<emphasis>apt.conf</emphasis> muss die nötigen Informationen enthalten, "
+"damit APT die Platte benutzt:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9815,10 +9884,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9829,10 +9898,10 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
@@ -9840,10 +9909,10 @@ msgstr ""
 "      Architektur haben. Es teilt dem fernen APT mit, welche Architektur die\n"
 "      Zielmaschine hat */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Die Platte für Statusinformationen benutzen und die Statusdatei\n"
@@ -9854,68 +9923,72 @@ msgstr ""
 "   // Programmzwischenspeicher werden lokal gespeichert\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Ort der Quellenliste.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Weitere Details finden sich in der apt.conf-Handbuchseite und der "
-"Musterkonfigurationsdatei in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"Musterkonfigurationsdatei in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Das Erste, was auf der Zielmaschine getan werden muss, ist das Einhängen der "
-"Platte und das Kopieren von <em>/var/lib/dpkg/status</em> dorthin. Sie "
-"werden außerdem die in der Übersicht umrissenen Verzeichnisse <em>archives/"
-"partial/</em> und <em>lists/partial/</em> erstellen müssen. Dann bringen Sie "
-"die Platte zu der fernen Maschine und konfigurieren Sie die »sources.list«. "
-"Führen Sie das folgende aus:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"Platte und das Kopieren von <emphasis>/var/lib/dpkg/status</emphasis> "
+"dorthin. Sie werden außerdem die in der Übersicht umrissenen Verzeichnisse "
+"<emphasis>archives/partial/</emphasis> und <emphasis>lists/partial/</"
+"emphasis> erstellen müssen. Dann bringen Sie die Platte zu der fernen "
+"Maschine und konfigurieren Sie die »sources.list«. Führen Sie das folgende "
+"aus:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT lädt die Paketdateien herunter ]\n"
 " # apt-get dist-upgrade\n"
 " [ APT lädt all die Pakete herunter, die die Zielmaschine benötigt, um ein\n"
-"   Upgrade durchzuführen ]"
+"   Upgrade durchzuführen ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Der Befehl »dist-upgrade« kann durch alle anderen Standard-APT-Befehle "
 "ersetzt werden, insbesondere »dselect-upgrade«. Sie können sogar eine APT-"
-"Oberfläche, wie <em>dselect</em>, benutzen. Jedoch stellt dies ein Problem "
-"dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren."
+"Oberfläche, wie <emphasis>dselect</emphasis>, benutzen. Jedoch stellt dies "
+"ein Problem dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9924,24 +9997,24 @@ msgstr ""
 "Upgrade der Zielmaschine druchzuführen. Bringen Sie die Platte zurück und "
 "starten Sie:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generiert eine lokale Kopie der Zwischenspeicherdateien ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Oder irgendeinen anderen APT-Befehl ]"
+"  [ Oder irgendeinen anderen APT-Befehl ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9949,8 +10022,8 @@ msgstr ""
 "Es ist für ordentliches Funktionieren notwendig, die Statusdatei erneut als "
 "die lokale anzugeben. Dies ist sehr wichtig!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9966,24 +10039,25 @@ msgstr ""
 "die Statusdatei NICHT, falls Dpkg oder APT in der Zwischenzeit benutzt "
 "wurden!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "APT und Wget benutzen"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> ist eine populäres und portierbares Download-Werkzeug, das auf "
-"nahezu jeder Maschine laufen kann. Anders als die Methode oben wird hierfür "
-"benötigt, dass die Debian-Maschine bereits eine Liste verfügbarer Pakete hat."
+"<emphasis>wget</emphasis> ist eine populäres und portierbares Download-"
+"Werkzeug, das auf nahezu jeder Maschine laufen kann. Anders als die Methode "
+"oben wird hierfür benötigt, dass die Debian-Maschine bereits eine Liste "
+"verfügbarer Pakete hat."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9996,13 +10070,13 @@ msgstr ""
 "Vorbereiten eines Wget-Skripts getan, um die eigentlichen Pakete "
 "herunterzuladen."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Betrieb"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -10011,23 +10085,23 @@ msgstr ""
 "Konfigurationsdateien benötigt. Es werden lediglich die Standard-APT-Befehle "
 "benutzt, um die Dateiliste zu erstellen."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Antworten Sie »nein« auf gestellte Fragen, wenn Sie mit den Aktionen\n"
 "   zufrieden sind ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /Platte/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /Platte/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -10035,8 +10109,8 @@ msgstr ""
 "Jeder andere Befehl als »dist-upgrade« könnte hier benutzt werden, "
 "einschließlich »upgrade«."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10048,25 +10122,25 @@ msgstr ""
 "sollte mit dem aktuellen Verzeichnis als Platteneinhängepunkt ausgeführt "
 "werden, so dass die Ausgabe auf die Platte gespeichert wird."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "Die ferne Maschine würde etwas wie das folgende tun"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /Platte\n"
 "  # sh -x ./wget-script\n"
-"  [ warten … Fertig ]"
+"  [ warten … Fertig ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10074,17 +10148,35 @@ msgstr ""
 "Sobald die Archive heruntergeladen und die Platte zur Debian-Maschine "
 "zurückgekehrt ist, kann die Installation fortfahren durch Benutzung von "
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
+#~ msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#~ msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+
+#~ msgid "<pubdate></pubdate>"
+#~ msgstr "<pubdate></pubdate>"
+
+#~ msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
+#~ msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $"
+
+#~ msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+
+#~ msgid "Copyright &copy; Jason Gunthorpe, 1998."
+#~ msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+
+#~ msgid "Copyright &copy; Jason Gunthorpe, 1999."
+#~ msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+
 #~ msgid "apt"
 #~ msgstr "apt"
 
@@ -10110,11 +10202,6 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 #~ 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 "
@@ -10130,9 +10217,6 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 #~ 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)"
diff --git a/doc/po/es.po b/doc/po/es.po
index cafda0041..24602318d 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-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-04 01:31+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,37 +699,37 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: 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
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: 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
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Descripción"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -738,7 +738,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -747,14 +747,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 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
+#: apt.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
@@ -766,14 +766,14 @@ msgstr ""
 "<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 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
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -791,7 +791,7 @@ msgstr ""
 "(stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -807,14 +807,14 @@ msgstr ""
 "en cuestión será instalado en vez de eliminado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 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
+#: apt.8.xml:95
 #, fuzzy
 #| msgid ""
 #| "<literal>showhold</literal> is used to print a list of packages on hold "
@@ -827,16 +827,16 @@ msgstr ""
 "de la misma forma que las otras órdenes «show»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
 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."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 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 "
@@ -844,19 +844,19 @@ msgid ""
 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
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "Opciones"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 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 "
@@ -866,12 +866,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 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 "
@@ -879,28 +879,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 #, 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
+#: apt.8.xml:151
 #, 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
+#: apt.8.xml:155
 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
+#: apt.8.xml:160
 #, fuzzy
 #| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
@@ -909,16 +909,16 @@ msgid ""
 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
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "Véase también"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -933,14 +933,14 @@ msgstr ""
 "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
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "Diagnósticos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
@@ -953,13 +953,13 @@ msgstr ""
 "100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 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
+#: apt-get.8.xml:35
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> is the command-line tool for handling "
@@ -979,8 +979,8 @@ msgstr ""
 "&synaptic; y &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
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -989,7 +989,7 @@ msgstr ""
 "una de las siguientes órdenes debe estar presente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -1013,7 +1013,7 @@ msgstr ""
 "tamaño de los archivos de paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -1038,7 +1038,7 @@ msgstr ""
 "hay nuevas versiones disponibles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1063,7 +1063,7 @@ msgstr ""
 "invalidar este comportamiento para paquetes individuales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1080,7 +1080,7 @@ msgstr ""
 "paquetes antiguos e instalar las nuevas versiones)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -1110,7 +1110,7 @@ msgstr ""
 "de apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1119,7 +1119,7 @@ msgstr ""
 "anterior de los paquetes y se debe utilizar con precaución."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -1139,7 +1139,7 @@ msgstr ""
 "instalarán."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1148,7 +1148,7 @@ msgstr ""
 "paquetes individuales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -1168,7 +1168,7 @@ 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:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1179,7 +1179,7 @@ msgstr ""
 "también cualquier fichero de configuración)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1198,7 +1198,7 @@ msgstr ""
 "release</literal>, si es posible."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1214,7 +1214,7 @@ msgstr ""
 "ninguna."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1229,7 +1229,7 @@ msgstr ""
 "paquete fuente no se desempaquetará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -1244,7 +1244,7 @@ msgstr ""
 "activando implícitamente la opción <literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1255,7 +1255,7 @@ msgstr ""
 "se descargan al directorio actual en la forma de archivos tar de fuentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1270,7 +1270,7 @@ msgstr ""
 "<option>--host-architecture</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1279,7 +1279,7 @@ msgstr ""
 "caché de paquetes y revisa la existencia de dependencias rotas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1288,7 +1288,7 @@ msgstr ""
 "directorio actual."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 #, fuzzy
 #| msgid ""
 #| "<literal>clean</literal> clears out the local repository of retrieved "
@@ -1313,7 +1313,7 @@ msgstr ""
 "literal> de vez en cuando para liberar algo de espacio en disco."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1332,7 +1332,7 @@ msgstr ""
 "desactivada impedirá que se borren los paquetes instalados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1343,7 +1343,7 @@ msgstr ""
 "ya no son necesarios."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1367,7 +1367,7 @@ msgstr ""
 "option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1376,7 +1376,7 @@ msgstr ""
 "de configuración: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1385,7 +1385,7 @@ msgstr ""
 "instalar. Opción de configuración: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1394,7 +1394,7 @@ msgstr ""
 "instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 #, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -1435,7 +1435,7 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1455,7 +1455,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1467,7 +1467,7 @@ msgstr ""
 "<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1487,7 +1487,7 @@ msgstr ""
 "no espera. Opción de configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1498,7 +1498,7 @@ msgstr ""
 "Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1517,7 +1517,7 @@ msgstr ""
 "acciones sin avisos de <literal>apt-get</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1533,7 +1533,7 @@ msgstr ""
 "(poco frecuente)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1549,7 +1549,7 @@ msgstr ""
 "<literal>APT::Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1558,7 +1558,7 @@ msgstr ""
 "Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1567,7 +1567,7 @@ msgstr ""
 "<literal>APT::Get::Show-Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1576,7 +1576,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1601,7 +1601,7 @@ msgstr ""
 "configuración: <literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1625,7 +1625,7 @@ msgstr ""
 "configuración: <literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1634,7 +1634,7 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1648,7 +1648,7 @@ msgstr ""
 "Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1660,7 +1660,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1673,7 +1673,7 @@ msgstr ""
 "configuración: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1687,7 +1687,7 @@ msgstr ""
 "<literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1703,7 +1703,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1725,7 +1725,7 @@ msgstr ""
 "<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 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. "
@@ -1739,7 +1739,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1749,7 +1749,7 @@ msgstr ""
 "ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 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 "
@@ -1767,7 +1767,7 @@ msgstr ""
 "<literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1791,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:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1805,7 +1805,7 @@ msgstr ""
 "<literal>APT::Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1814,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:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1827,7 +1827,7 @@ msgstr ""
 "Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 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 "
@@ -1847,7 +1847,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 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</"
@@ -1858,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:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1867,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:529
+#: apt-get.8.xml:523
 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::"
@@ -1878,7 +1878,7 @@ msgstr ""
 "configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1888,13 +1888,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Ficheros"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1910,7 +1910,7 @@ msgstr ""
 "preferences;, el Cómo de APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1919,12 +1919,12 @@ msgstr ""
 "100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "Realiza consultas al caché de APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1937,7 +1937,7 @@ msgstr ""
 "genera información interesante a partir de los metadatos del paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1947,14 +1947,14 @@ msgstr ""
 "si está obsoleta."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1978,7 +1978,7 @@ msgstr ""
 "siguiente:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -2004,7 +2004,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -2023,7 +2023,7 @@ msgstr ""
 "salida lo mejor es consultar el código fuente de apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -2032,7 +2032,7 @@ msgstr ""
 "necesita ningún argumento adicional. Las estadísticas que muestra son:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -2041,7 +2041,7 @@ msgstr ""
 "encontrados en la caché."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -2054,7 +2054,7 @@ msgstr ""
 "dependencias. La mayoría de los paquetes pertenecen a este grupo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -2071,7 +2071,7 @@ msgstr ""
 "agent», pero no hay ningún paquete que se llame «mail-transport-agent»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2084,7 +2084,7 @@ msgstr ""
 "paquete, xless, proporciona «X11-text-viewer»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2098,7 +2098,7 @@ msgstr ""
 "paquete debconf-tiny."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2114,7 +2114,7 @@ msgstr ""
 "«Conflicts» o «Breaks» de la descripción de los paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -2129,7 +2129,7 @@ msgstr ""
 "considerablemente mayor que el número total de paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2138,7 +2138,7 @@ msgstr ""
 "dependencia de todos los paquetes de la caché."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2150,7 +2150,7 @@ msgstr ""
 "son binarios."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2159,7 +2159,7 @@ msgstr ""
 "la caché. Fundamentalmente para depuración."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2169,7 +2169,7 @@ msgstr ""
 "además, la usa el método &dselect;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2178,7 +2178,7 @@ msgstr ""
 "satisfechas en la caché de paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2187,12 +2187,12 @@ msgstr ""
 "avail</command>, muestra los campos del paquete para los paquetes nombrados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2214,7 +2214,7 @@ msgstr ""
 "de los paquetes, no en la descripción larga."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2223,7 +2223,7 @@ msgstr ""
 "búsqueda que se juntarán mediante una «Y lógica»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2232,7 +2232,7 @@ msgstr ""
 "paquete y de todos los demás paquetes que la pueden satisfacer."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2240,12 +2240,12 @@ msgstr ""
 "<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -2261,7 +2261,7 @@ msgstr ""
 "generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -2272,7 +2272,7 @@ msgstr ""
 "virtuales también aparecen en la lista generada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2293,7 +2293,7 @@ msgstr ""
 "active la opción <literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2308,12 +2308,12 @@ msgstr ""
 "líneas verdes son conflictos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2323,12 +2323,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -2341,7 +2341,7 @@ msgstr ""
 "detallada acerca de la prioridad de selección del paquete nombrado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -2360,7 +2360,7 @@ msgstr ""
 "paquetes (<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2371,7 +2371,7 @@ msgstr ""
 "configuración: <literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2386,7 +2386,7 @@ msgstr ""
 "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2400,7 +2400,7 @@ msgstr ""
 "configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2412,7 +2412,7 @@ msgstr ""
 "Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2428,7 +2428,7 @@ msgstr ""
 "<literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2437,7 +2437,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2454,7 +2454,7 @@ msgstr ""
 "configuración: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2466,7 +2466,7 @@ msgstr ""
 "Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2475,7 +2475,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2486,7 +2486,7 @@ msgstr ""
 "configuración: <literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2497,7 +2497,7 @@ msgstr ""
 "vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2508,12 +2508,12 @@ msgstr ""
 "Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2522,12 +2522,12 @@ msgstr ""
 "valor 100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "Herramienta para gestionar las claves de APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -2538,12 +2538,12 @@ msgstr ""
 "claves se consideran de confianza."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Órdenes"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2554,32 +2554,32 @@ msgstr ""
 "entrada estándar si el nombre de fichero se define como <literal>-</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "Elimina una clave de la lista de claves de confianza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Muestra la clave &synopsis-param-keyid; por la salida estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "Devuelve todas las claves de confianza por la salida estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "Lista las claves de confianza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "Lista las huellas digitales de las claves de confianza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2588,7 +2588,7 @@ msgstr ""
 "«adv --recv-key»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2602,7 +2602,7 @@ msgstr ""
 "en &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2620,12 +2620,12 @@ msgstr ""
 "de APT para Ubuntu sí es compatible."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Opciones"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2634,7 +2634,7 @@ msgstr ""
 "descritas en el sección anterior."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2651,49 +2651,49 @@ msgstr ""
 "es, por ejemplo, que las claves nuevas se añaden a este fichero."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "Base de datos local de las claves de confianza de archivos Debian"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Registro de las claves de confianza del archivo de &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Registro de las claves de confianza eliminadas del archivo de &keyring-"
 "distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "Marca o desmarca un paquete como instalado automáticamente"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2702,7 +2702,7 @@ msgstr ""
 "o no."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -2718,7 +2718,7 @@ msgstr ""
 "eliminará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2729,7 +2729,7 @@ msgstr ""
 "ningún otro paquete manualmente instalado depende de este paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2740,7 +2740,7 @@ msgstr ""
 "otro depende de él."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2755,7 +2755,7 @@ msgstr ""
 "file</option> tenga efecto sobre él."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2764,7 +2764,7 @@ msgstr ""
 "sobre un paquete previamente marcado con «hold»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2777,7 +2777,7 @@ msgstr ""
 "paquetes solo se muestran aquellos automáticamente instalados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2788,7 +2788,7 @@ msgstr ""
 "paquetes manualmente instalados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2797,7 +2797,7 @@ msgstr ""
 "de la misma forma que las otras órdenes «show»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2811,7 +2811,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2820,12 +2820,12 @@ msgstr ""
 "100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "Compatibilidad con la autenticación en el archivo para APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -2838,7 +2838,7 @@ msgstr ""
 "sin acceso a la clave con la que se firmó el fichero «Release»."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 msgid ""
 "If a package comes from a archive without a signature, or with a signature "
 "that apt does not have a key for, that package is considered untrusted, and "
@@ -2854,7 +2854,7 @@ msgstr ""
 "ellas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2863,12 +2863,12 @@ msgstr ""
 "pueden usar esta nueva funcionalidad de autenticación."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Archivos de confianza"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2885,7 +2885,7 @@ msgstr ""
 "asegurar que la integridad del archivo es correcta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2898,7 +2898,7 @@ msgstr ""
 "devscripts respectivamente)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. In order to become "
@@ -2916,7 +2916,7 @@ msgstr ""
 "identidad del propietario de la clave."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2938,7 +2938,7 @@ msgstr ""
 "&keyring-distro; en el paquete &keyring-package; package."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2950,7 +2950,7 @@ msgstr ""
 "APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2959,7 +2959,7 @@ msgstr ""
 "individualmente. Se diseñó para prevenir dos posible ataques:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2975,7 +2975,7 @@ msgstr ""
 "envenenamiento de ARP o de DNS)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2988,7 +2988,7 @@ msgstr ""
 "usuarios que descarguen paquetes de dicha réplica."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -3001,12 +3001,12 @@ msgstr ""
 "una firma por paquete."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Configuración de usuario"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys, although an installation of "
@@ -3020,7 +3020,7 @@ msgstr ""
 "paquetes de Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -3037,12 +3037,12 @@ msgstr ""
 "archivos de paquetes configurados."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Configuración del archivo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -3051,7 +3051,7 @@ msgstr ""
 "que:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -3062,7 +3062,7 @@ msgstr ""
 "utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -3073,7 +3073,7 @@ msgstr ""
 "o Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -3084,7 +3084,7 @@ msgstr ""
 "del archivo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3095,16 +3095,16 @@ msgstr ""
 "explicados anteriormente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3121,12 +3121,12 @@ msgstr ""
 "una Distribución</ulink> de V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Autores de la página del manual"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -3135,12 +3135,12 @@ msgstr ""
 "Peña, Isaac Jones, Colin Walters, Florian Weimer y Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "Herramienta de APT para la gestión de discos ópticos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3153,7 +3153,7 @@ msgstr ""
 "verifica los ficheros de índice."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -3165,7 +3165,7 @@ msgstr ""
 "errores de grabación."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3180,7 +3180,7 @@ msgstr ""
 "título descriptivo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3191,7 +3191,7 @@ msgstr ""
 "identificadores en <filename>&statedir;/cdroms.list</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3200,7 +3200,7 @@ msgstr ""
 "así como del nombre del fichero guardado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 #, fuzzy
 #| msgid ""
 #| "Mount point; specify the location to mount the CD-ROM. This mount point "
@@ -3217,7 +3217,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 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.  "
@@ -3229,7 +3229,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3241,7 +3241,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3251,7 +3251,7 @@ msgstr ""
 "de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3264,7 +3264,7 @@ msgstr ""
 "de configuración: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3276,7 +3276,7 @@ msgstr ""
 "pero encontrará todo el contenido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3287,12 +3287,12 @@ msgstr ""
 "CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3301,12 +3301,12 @@ msgstr ""
 "100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "Programa para consultar la configuración de APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3320,7 +3320,7 @@ msgstr ""
 "sencillo de usar por aplicaciones con scripts."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -3336,7 +3336,7 @@ msgstr ""
 "manera en un script de intérprete de órdenes:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3348,7 +3348,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3357,7 +3357,7 @@ msgstr ""
 "valor de MyApp::Opciones, y con <option>-f</option> por omisión."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -3370,12 +3370,12 @@ msgstr ""
 "internamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Sólo muestra el contenido del espacio de configuración."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3384,12 +3384,12 @@ msgstr ""
 "predeterminado, utilice «--no-empty» para eliminarlos de la salida."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3407,13 +3407,13 @@ msgstr ""
 "utilizando &percnt;&percnt;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3422,27 +3422,27 @@ msgstr ""
 "valor 100 en caso de error."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Documentación inicial de Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "Fichero de configuración de APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3456,7 +3456,7 @@ msgstr ""
 "ofrecer un entorno homogéneo."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3465,7 +3465,7 @@ msgstr ""
 "en el siguiente orden:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3474,7 +3474,7 @@ msgstr ""
 "existir)."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3493,7 +3493,7 @@ msgstr ""
 "forma silenciosa."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3501,7 +3501,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3510,12 +3510,12 @@ msgstr ""
 "configuración o para cargar más ficheros de configuración."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Sintaxis"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3530,7 +3530,7 @@ msgstr ""
 "APT. Las opciones no se heredan de sus grupos paternos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3556,7 +3556,7 @@ msgstr ""
 "llaves, como:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3574,7 +3574,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -3586,13 +3586,13 @@ msgstr ""
 "separadas por punto y coma."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3601,7 +3601,7 @@ msgstr ""
 "buena guía para entender su aspecto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3611,7 +3611,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3626,7 +3626,7 @@ msgstr ""
 "cualquier otra opción reasignando un nuevo valor a la opción."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3646,7 +3646,7 @@ msgstr ""
 "acabar con punto y coma)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3662,7 +3662,7 @@ msgstr ""
 "los ámbitos no se pueden redefinir, sólo eliminar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3681,7 +3681,7 @@ msgstr ""
 "sintaxis de ámbitos en la línea de órdenes)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3711,12 +3711,12 @@ msgstr ""
 "declaraciones ahora que APT no muestra fallos de forma explícita."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "El grupo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3725,7 +3725,7 @@ msgstr ""
 "mantiene las opciones para todas las herramientas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3736,7 +3736,7 @@ msgstr ""
 "arquitectura para la que apt se compiló."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3758,7 +3758,7 @@ msgstr ""
 "add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3767,7 +3767,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3781,7 +3781,7 @@ msgstr ""
 "«5.0*». Consulte también &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3790,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:201
+#: apt.conf.5.xml:195
 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 "
@@ -3804,7 +3804,7 @@ msgstr ""
 "mecanismo directo para reinstalarlos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 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 "
@@ -3831,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:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3860,7 +3860,7 @@ msgstr ""
 "anteriormente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 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 "
@@ -3877,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:245
+#: apt.conf.5.xml:239
 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 "
@@ -3898,7 +3898,7 @@ msgstr ""
 "sobre la que estos paquetes dependen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 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 "
@@ -3935,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:273
+#: apt.conf.5.xml:267
 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:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3951,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:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3960,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:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3969,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:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "El grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3985,7 +3985,7 @@ msgstr ""
 "sí mismo (consulte también &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -4006,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:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -4025,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:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -4045,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:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -4056,7 +4056,7 @@ msgstr ""
 "enteros. Su valor predeterminado es «true»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 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 "
@@ -4074,7 +4074,7 @@ msgstr ""
 "parches."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4089,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:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4098,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:364
+#: apt.conf.5.xml:358
 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."
@@ -4108,7 +4108,7 @@ msgstr ""
 "«true» de forma predeterminada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 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]/</"
@@ -4128,7 +4128,7 @@ msgstr ""
 "opciones anteriores."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 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 "
@@ -4147,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:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 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."
@@ -4157,7 +4157,7 @@ msgstr ""
 "y a la recepción de datos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 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."
@@ -4177,7 +4177,7 @@ msgstr ""
 "cumplir la especificación HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4186,7 +4186,7 @@ msgstr ""
 "redirección; activado por omisión."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:394
 #, fuzzy
 #| msgid ""
 #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
@@ -4208,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:407
+#: apt.conf.5.xml:401
 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 "
@@ -4219,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:411
+#: apt.conf.5.xml:405
 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 "
@@ -4233,7 +4233,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4250,7 +4250,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4290,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:458
+#: apt.conf.5.xml:452
 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]/</"
@@ -4323,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:478
+#: apt.conf.5.xml:472
 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, "
@@ -4340,7 +4340,7 @@ msgstr ""
 "ejemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 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 "
@@ -4354,7 +4354,7 @@ msgstr ""
 "a su poca eficiencia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4370,13 +4370,13 @@ msgstr ""
 "compatibles con la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"algo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4398,7 +4398,7 @@ msgstr ""
 "especificar órdenes para desmontar mediante UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4407,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:523
+#: apt.conf.5.xml:517
 #, 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:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4433,19 +4433,19 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, 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:531
+#: apt.conf.5.xml:525
 #, 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:524
+#: apt.conf.5.xml:518
 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 "
@@ -4477,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:538
+#: apt.conf.5.xml:532
 #, 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:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4508,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:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4520,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:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4534,7 +4534,7 @@ msgstr ""
 "paquetes locales. El valor predeterminado es «false»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4553,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:575
+#: apt.conf.5.xml:569
 #, 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:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4598,7 +4598,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4612,22 +4612,22 @@ msgstr ""
 "implícito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "Directorios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4648,16 +4648,28 @@ msgstr ""
 "filename> ó <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contiene las ubicaciones que afectan a la "
 "información de la caché local, como los dos cachés de paquetes "
@@ -4670,7 +4682,7 @@ msgstr ""
 "directorio predeterminado está en <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4686,7 +4698,7 @@ msgstr ""
 "<envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4697,7 +4709,7 @@ msgstr ""
 "Al finalizar este proceso carga el fichero de configuración principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4714,7 +4726,7 @@ msgstr ""
 "literal> especifican la ubicación de sus respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4735,7 +4747,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4753,12 +4765,12 @@ msgstr ""
 "de expresiones regulares."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "APT con DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4769,7 +4781,7 @@ msgstr ""
 "encuentran en la sección <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4791,7 +4803,7 @@ msgstr ""
 "realiza esta acción antes de descargar paquetes nuevos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4800,7 +4812,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:682
+#: 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 update phase."
@@ -4809,7 +4821,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:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4819,12 +4831,12 @@ msgstr ""
 "preguntará en caso de error."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "Invocación de APT a dpkg"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4833,7 +4845,7 @@ msgstr ""
 "se encuentran en la sección <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4844,7 +4856,7 @@ msgstr ""
 "introduce a &dpkg; como un sólo argumento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4857,7 +4869,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:712
+#: apt.conf.5.xml:707
 #, fuzzy
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4881,7 +4893,7 @@ msgstr ""
 "la entrada estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 #, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
@@ -4903,7 +4915,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4914,7 +4926,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4925,7 +4937,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4934,7 +4946,7 @@ msgstr ""
 "predeterminado es <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4944,12 +4956,12 @@ msgstr ""
 "paquetes y a producir todos los binarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 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:752
+#: apt.conf.5.xml:747
 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 "
@@ -4976,7 +4988,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:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4990,7 +5002,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -5014,7 +5026,7 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -5037,7 +5049,7 @@ msgstr ""
 "eliminación."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5067,7 +5079,7 @@ msgstr ""
 "imposibilidad de arrancar el sistema. "
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5085,7 +5097,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:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5101,7 +5113,7 @@ msgstr ""
 "los disparadores necesarios para configurar este paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5119,7 +5131,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 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 "
@@ -5144,12 +5156,12 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Las opciones «Periodic» y «Archives»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5163,12 +5175,12 @@ msgstr ""
 "documentación de estas opciones."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "Opciones de depuración"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5185,7 +5197,7 @@ msgstr ""
 "para un usuario normal, aunque unas cuantas sí son:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5196,7 +5208,7 @@ msgstr ""
 "purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5207,7 +5219,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:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5219,7 +5231,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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5228,14 +5240,14 @@ msgstr ""
 "statfs en los identificadores de los discos ópticos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 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:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5243,26 +5255,26 @@ msgstr ""
 "<literal>cdrom://</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 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:918
+#: apt.conf.5.xml:913
 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:929
+#: apt.conf.5.xml:924
 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:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5271,7 +5283,7 @@ msgstr ""
 "criptográficas mediante <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5280,14 +5292,14 @@ msgstr ""
 "paquetes almacenadas en CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 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:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5296,7 +5308,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5307,7 +5319,7 @@ msgstr ""
 "identificador de un CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5317,14 +5329,14 @@ msgstr ""
 "a la vez."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 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:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5334,7 +5346,7 @@ msgstr ""
 "ficheros descargados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5343,7 +5355,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:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5353,7 +5365,7 @@ msgstr ""
 "índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5361,7 +5373,7 @@ msgstr ""
 "descargas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5370,7 +5382,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:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5386,7 +5398,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5417,7 +5429,7 @@ msgstr ""
 "la sección en la que aparece el paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5426,7 +5438,7 @@ msgstr ""
 "invocó, con los argumentos separados por un espacio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5435,7 +5447,7 @@ msgstr ""
 "estado y cualquier error encontrado durante el análisis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5444,7 +5456,7 @@ msgstr ""
 "literal> debería entregar los paquetes a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5452,12 +5464,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 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:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5466,7 +5478,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:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5477,7 +5489,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:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5486,7 +5498,7 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 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 "
@@ -5494,13 +5506,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Ejemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5510,17 +5522,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "Fichero de preferencias de APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5533,7 +5545,7 @@ msgstr ""
 "paquetes seleccionados para su instalación."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5554,7 +5566,7 @@ msgstr ""
 "usuario sobre qué versión se seleccionará para su instalación."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -5569,7 +5581,7 @@ msgstr ""
 "APT no modifican la elección del ejemplar, sólo la elección de la versión."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -5593,7 +5605,7 @@ msgstr ""
 "que no funcionen como se espera. Queda avisado."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5614,24 +5626,24 @@ msgstr ""
 "Files-Silently</literal>. Si coincide, el fichero se ignora silenciosamente."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "Asignación de prioridades predeterminadas de APT "
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -5659,7 +5671,7 @@ msgstr ""
 "\"0\"/><placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
@@ -5669,12 +5681,12 @@ msgstr ""
 "Asignar: "
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "priority 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5687,12 +5699,12 @@ msgstr ""
 "literal> de Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "prioridad 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5706,12 +5718,12 @@ msgstr ""
 "<literal>squeeze-backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "prioridad 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -5720,12 +5732,12 @@ msgstr ""
 "objetivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "prioridad 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -5733,7 +5745,7 @@ msgstr ""
 "objetivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -5750,7 +5762,7 @@ msgstr ""
 "la opción «ButAutomaticUpgrades: yes»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5759,7 +5771,7 @@ msgstr ""
 "determinar qué versión del paquete debe instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5776,12 +5788,12 @@ msgstr ""
 "ser peligroso)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "Instala la versión de mayor prioridad."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5790,7 +5802,7 @@ msgstr ""
 "(esto es, la que tiene un número de versión mayor)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5801,7 +5813,7 @@ msgstr ""
 "<literal>--reinstall</literal>, se instalará la que no está instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5816,7 +5828,7 @@ msgstr ""
 "command> o <command>apt-get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5830,7 +5842,7 @@ msgstr ""
 "upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5849,12 +5861,12 @@ msgstr ""
 "versión instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "El efecto de las preferencias sobre APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5867,7 +5879,7 @@ msgstr ""
 "registros pueden tener una de estos dos formatos: el específico o el general."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5884,7 +5896,7 @@ msgstr ""
 "paquetes separados por espacios."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5896,7 +5908,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -5911,7 +5923,7 @@ msgstr ""
 "identificado por su nombre de dominio."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -5922,7 +5934,7 @@ msgstr ""
 "prioridad alta a todas las versiones disponibles desde un sitio local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5934,7 +5946,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -5948,7 +5960,7 @@ msgstr ""
 "debian.org»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5960,7 +5972,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5975,7 +5987,7 @@ msgstr ""
 "sino el autor o el nombre del proveedor, tales como «Debian» o «Ximian»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5986,7 +5998,7 @@ msgstr ""
 "archivo de paquetes «<literal>unstable</literal>» (inestable)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5998,7 +6010,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -6009,7 +6021,7 @@ msgstr ""
 "«<literal>&testing-codename;</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6021,7 +6033,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6033,7 +6045,7 @@ msgstr ""
 "«<literal>&stable-version;</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6045,12 +6057,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Expresiones regulares y sintaxis &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -6065,7 +6077,7 @@ msgstr ""
 "«kde» (como expresión regular extendida POSIX delimitada por barras)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -6077,7 +6089,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6088,7 +6100,7 @@ msgstr ""
 "paquetes provenientes de una publicación a partir de &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6100,7 +6112,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6118,12 +6130,12 @@ msgstr ""
 "literal>» en un campo «Package» no se considera una expresión &glob;."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Interpretación de APT de las prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6133,12 +6145,12 @@ msgstr ""
 "siguiente modo:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6147,12 +6159,12 @@ msgstr ""
 "el sistema."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6161,12 +6173,12 @@ msgstr ""
 "que la versión instalada sea más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -6176,12 +6188,12 @@ msgstr ""
 "más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -6190,12 +6202,12 @@ msgstr ""
 "perteneciente a otra distribución, o si la versión instalada es más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -6203,17 +6215,17 @@ msgstr ""
 "La versión sólo se instala si no hay ninguna versión del paquete instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "Evita la instalación de la versión."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6227,7 +6239,7 @@ msgstr ""
 "versión del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6236,7 +6248,7 @@ msgstr ""
 "registros antes mencionados:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6264,12 +6276,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Por ello:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -6284,7 +6296,7 @@ msgstr ""
 "perl;*, se instalará una versión anterior de <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6295,7 +6307,7 @@ msgstr ""
 "versiones, incluso sobre los pertenecientes a la distribución objetivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6308,12 +6320,12 @@ msgstr ""
 "hay ninguna versión del paquete ya instalado."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinar la versión del paquete y las propiedades de la distribución"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6324,7 +6336,7 @@ msgstr ""
 "describen los paquetes disponibles en cada uno de los sitios."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6344,27 +6356,27 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "La línea <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "indica el nombre del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "La línea <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "indica el número de versión del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6385,12 +6397,12 @@ msgstr ""
 "son relevantes para las prioridades de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6408,18 +6420,18 @@ msgstr ""
 "línea en el fichero de preferencias de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "La línea <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6438,13 +6450,13 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6461,7 +6473,7 @@ msgstr ""
 "siguientes línea en el fichero de preferencias de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6473,12 +6485,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "La línea <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6497,18 +6509,18 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "La línea <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6521,18 +6533,18 @@ msgstr ""
 "mediante la siguiente línea:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "La línea <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6545,13 +6557,13 @@ msgstr ""
 "siguiente línea:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6576,12 +6588,12 @@ msgstr ""
 "la distribución «<literal>unstable</literal>» (inestable)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Líneas opcionales en el registro de preferencias de APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6592,12 +6604,12 @@ msgstr ""
 "Útil para comentarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Seguir la distribución «stable» (estable)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6621,7 +6633,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6636,8 +6648,8 @@ msgstr ""
 "<literal>Debian</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6649,7 +6661,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6663,13 +6675,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6682,12 +6694,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6715,7 +6727,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6732,7 +6744,7 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6745,13 +6757,13 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6770,12 +6782,12 @@ msgstr ""
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Seguir la evolución de una publicación por el nombre"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6809,7 +6821,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6836,7 +6848,7 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6850,13 +6862,13 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6875,17 +6887,17 @@ msgstr ""
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "Lista de fuentes de datos de APT configurados"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6902,7 +6914,7 @@ msgstr ""
 "command> (o una orden equivalente de una interfaz de APT)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6917,12 +6929,12 @@ msgstr ""
 "cualquier lugar de la línea marca los caracteres restantes como comentario."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -6944,12 +6956,12 @@ msgstr ""
 "silenciosamente."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "Los tipos «deb» y «deb-src»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6975,7 +6987,7 @@ msgstr ""
 "literal> para obtener los índices de fuentes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6984,14 +6996,14 @@ msgstr ""
 "usando los tipos <literal>deb</literal> y <literal>deb-src</literal> es:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, fuzzy, no-wrap
 #| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ opciones ] uri distribución [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -7014,14 +7026,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 #, fuzzy
 #| msgid ""
 #| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -7052,7 +7064,7 @@ msgstr ""
 "<literal>distribución</literal> no define una ruta exacta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 #, fuzzy
 #| msgid ""
 #| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -7081,7 +7093,7 @@ msgstr ""
 "sistema."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 #, fuzzy
 #| msgid ""
 #| "Since only one distribution can be specified per line it may be necessary "
@@ -7121,7 +7133,7 @@ msgstr ""
 "aprovechar mejor el ancho de banda."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -7138,7 +7150,7 @@ msgstr ""
 "ignoran silenciosamente):"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7153,7 +7165,7 @@ msgstr ""
 "arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 #, fuzzy
 #| msgid ""
 #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -7174,7 +7186,7 @@ msgstr ""
 "arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -7192,7 +7204,7 @@ msgstr ""
 "autenticadas no lo están."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -7205,12 +7217,12 @@ msgstr ""
 "seguidos por servidores de Internet distantes, por ejemplo)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Algunos ejemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7222,17 +7234,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "Especificación del URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "Los tipos de URI permitidos actualmente son:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7243,7 +7255,7 @@ msgstr ""
 "particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7253,7 +7265,7 @@ msgstr ""
 "list»."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7271,7 +7283,7 @@ msgstr ""
 "autenticación no es seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7292,7 +7304,7 @@ msgstr ""
 "fichero de configuración."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -7305,7 +7317,7 @@ msgstr ""
 "permite realizar la copia de ficheros con APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7319,12 +7331,12 @@ msgstr ""
 "transferencia de ficheros desde la máquina remota."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "Añadir más tipos de URI reconocidos."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7343,7 +7355,7 @@ msgstr ""
 "debtorrent, consulte &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7352,36 +7364,36 @@ msgstr ""
 "para «stable/main», «stable/contrib», y «stable/non-free»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Como arriba, excepto que usa la distribución «unstable» (en desarrollo)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "Línea para obtener el código fuente desde la ubicación anterior."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7392,7 +7404,7 @@ msgstr ""
 "obtiene <literal>amd64</literal> y <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7402,7 +7414,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7411,13 +7423,13 @@ msgstr ""
 "usa sólo la sección «hamm/main»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7426,13 +7438,13 @@ msgstr ""
 "del directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7445,19 +7457,19 @@ msgstr ""
 "filename>, se usará sólo una sesión FTP para ambas."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7476,17 +7488,17 @@ msgstr ""
 "tiene esta estructura.) <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7495,7 +7507,7 @@ msgstr ""
 "plantillas de paquetes de Debian"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7510,12 +7522,12 @@ msgstr ""
 "plantillas, se generará una salida de una línea con el formato:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "paquete versión fichero-de-plantilla script-de-configuración"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7530,7 +7542,7 @@ msgstr ""
 "XXXXXX</filename> y <filename>paquete.config.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7541,7 +7553,7 @@ msgstr ""
 "de configuración: <literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7550,12 +7562,12 @@ msgstr ""
 "error, y el valor 100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "Herramienta para ordenar los ficheros de índice de paquetes"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -7568,7 +7580,7 @@ msgstr ""
 "ordenación internas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7576,7 +7588,7 @@ msgstr ""
 "fichero ubicable."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7585,7 +7597,7 @@ msgstr ""
 "configuración: <literal>APT::SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7594,12 +7606,12 @@ msgstr ""
 "valor 100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "Herramienta para generar ficheros de índice"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -7612,7 +7624,7 @@ msgstr ""
 "de origen basado en el contenido de ese sitio."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7627,7 +7639,7 @@ msgstr ""
 "«script» para el proceso de generación de un archivo completo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -7642,7 +7654,7 @@ msgstr ""
 "los ficheros y genera los ficheros de salida comprimidos deseados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7655,7 +7667,7 @@ msgstr ""
 "orden es casi un equivalente de &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7663,7 +7675,7 @@ msgstr ""
 "datos binaria para la caché (registro de paquetes)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7677,7 +7689,7 @@ msgstr ""
 "scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -7688,7 +7700,7 @@ msgstr ""
 "para cambiar el fichero de fuentes alternativo que se usará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7706,7 +7718,7 @@ msgstr ""
 "por una coma en la salida."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7732,7 +7744,7 @@ msgstr ""
 "contiene una suma de control MD5, SHA1 y SHA256 para cada fichero."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7753,7 +7765,7 @@ msgstr ""
 "<literal>Components</literal> y <literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -7769,7 +7781,7 @@ msgstr ""
 "configuración necesaria."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7779,12 +7791,12 @@ msgstr ""
 "necesarios."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "La configuración de «generate»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7802,7 +7814,7 @@ msgstr ""
 "etiqueta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7810,12 +7822,12 @@ msgstr ""
 "a continuación."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "Sección <literal>Dir</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7828,7 +7840,7 @@ msgstr ""
 "secciones posteriores para producir una ruta absoluta."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -7839,17 +7851,17 @@ msgstr ""
 "«dist»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "Define la ubicación de los ficheros alternativos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "Define la ubicación de los ficheros almacenados."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7858,12 +7870,12 @@ msgstr ""
 "posteriormente el valor <literal>FileList</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "Sección <literal>Default</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7874,7 +7886,7 @@ msgstr ""
 "sobrescribir estos valores predeterminados con un valor de la sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -7888,7 +7900,7 @@ msgstr ""
 "compresión es «. gzip»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7897,7 +7909,7 @@ msgstr ""
 "paquete. El valor predeterminado es «.deb»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7906,7 +7918,7 @@ msgstr ""
 "controla la compresión para los ficheros «Sources»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7915,7 +7927,7 @@ msgstr ""
 "ficheros de fuentes. El valor predeterminado es «.dsc»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7924,7 +7936,7 @@ msgstr ""
 "controla la compresión para los ficheros «Contents»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7933,7 +7945,7 @@ msgstr ""
 "controla la compresión para el fichero maestro Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7944,7 +7956,7 @@ msgstr ""
 "cada sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -7954,7 +7966,7 @@ msgstr ""
 "sin tener en cuenta la máscara de usuario («umask»)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7965,12 +7977,12 @@ msgstr ""
 "maestro."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "Sección <literal>TreeDefault</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7981,7 +7993,7 @@ msgstr ""
 "$(DIST), $(SECTION) y $(ARCH) con sus valores respectivos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -7992,7 +8004,7 @@ msgstr ""
 "que durante varios días todos se regenerarán."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -8011,7 +8023,7 @@ msgstr ""
 "unidades usadas son días."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -8020,7 +8032,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -8029,7 +8041,7 @@ msgstr ""
 "predeterminado es <filename>$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -8038,7 +8050,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -8047,7 +8059,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -8058,7 +8070,7 @@ msgstr ""
 "predeterminado es <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -8069,7 +8081,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -8084,13 +8096,13 @@ msgstr ""
 "automáticamente esos ficheros de paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 "Define el fichero de cabecera a añadir al fichero «Contents» de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8099,7 +8111,7 @@ msgstr ""
 "Varias secciones pueden compartir la misma base de datos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8111,7 +8123,7 @@ msgstr ""
 "como prefijo el directorio del archivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8125,12 +8137,12 @@ msgstr ""
 "índices de fuentes."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "Sección <literal>Tree</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8145,7 +8157,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -8158,7 +8170,7 @@ msgstr ""
 "valor como <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8169,7 +8181,7 @@ msgstr ""
 "variables."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8183,7 +8195,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8194,7 +8206,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8205,7 +8217,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -8216,7 +8228,7 @@ msgstr ""
 "indicar que este árbol tiene un fichero de fuentes."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8225,7 +8237,7 @@ msgstr ""
 "sección, la prioridad y la dirección del mantenedor."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8234,22 +8246,22 @@ msgstr ""
 "la sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "Define el fichero binario alternativo adicional."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "Define el fichero de fuentes alternativo adicional."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "Sección <literal>BinDirectory</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8264,12 +8276,12 @@ msgstr ""
 "<literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "Define el fichero «Packages» de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8278,42 +8290,42 @@ msgstr ""
 "<literal>Packages</literal> o <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "Define el fichero «Contents» de salida (opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "Define el fichero binario alternativo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "Define el fichero de fuentes alternativo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "Define la base de datos de la caché."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "Añade una ruta a todas las rutas de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "Define el fichero de la lista de ficheros."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "El fichero binario alternativo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8328,19 +8340,19 @@ msgstr ""
 "de permutación del mantenedor."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "antigua [// antigua-n]* => nueva"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "nueva"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8357,12 +8369,12 @@ msgstr ""
 "segunda forma sustituye de forma incondicional el campo del mantenedor."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "El fichero de fuentes alternativo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8373,12 +8385,12 @@ msgstr ""
 "nombre del paquete fuente, el segundo es la sección a la que se asignará."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "El fichero alternativo adicional"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8389,7 +8401,7 @@ msgstr ""
 "paquete, la segunda es la etiqueta y el resto de la línea es el nuevo valor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8413,7 +8425,7 @@ msgstr ""
 "<literal>MD5</literal>, <literal>SHA1</literal> o <literal>SHA256</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8422,7 +8434,7 @@ msgstr ""
 "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -8436,7 +8448,7 @@ msgstr ""
 "configuración. Opción de configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -8449,7 +8461,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -8466,7 +8478,7 @@ msgstr ""
 "Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8477,7 +8489,7 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8486,7 +8498,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8500,7 +8512,7 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8524,7 +8536,7 @@ msgstr ""
 "comprobaciones adicionales son innecesarias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8540,13 +8552,13 @@ msgstr ""
 "con la orden «generate»."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8555,7 +8567,7 @@ msgstr ""
 "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8563,36 +8575,53 @@ msgstr ""
 "<command>apt-ftparchive</command> devuelve cero si no hay ningún error, y el "
 "valor 100 en caso de error."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "es"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "Guía de usuario de APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Este documento ofrece una introducción sobre cómo usar el gestor de paquetes "
 "APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8604,8 +8633,8 @@ msgstr ""
 "Public License publicada por la Free Software Foundation, ya sea en su "
 "versión 2 o (a su elección) cualquier versión posterior."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8613,31 +8642,31 @@ msgstr ""
 "Para más detalles acerca de sistemas Debian y la licencia completa, consulte "
 "el fichero «/usr/share/common-licenses/GPL»."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "General"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"El paquete APT contiene a día de hoy dos secciones, el método <prgn>dselect</"
-"prgn> y la interfaz de usuario para la línea de órdenes <prgn>apt-get</"
-"prgn>. Ambos ofrecen una manera de instalar y desinstalar paquetes, así como "
-"descargar paquetes nuevos de Internet."
+"El paquete APT contiene a día de hoy dos secciones, el método "
+"<command>dselect</command> y la interfaz de usuario para la línea de órdenes "
+"<command>apt-get</command>. Ambos ofrecen una manera de instalar y "
+"desinstalar paquetes, así como descargar paquetes nuevos de Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Anatomía del sistema de paquetes"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8647,8 +8676,8 @@ msgstr ""
 "asociada a cada paquete para asegurar una integración sencilla y limpia en "
 "el sistema. La característica más importante es el sistema de dependencias."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8663,8 +8692,8 @@ msgstr ""
 "permite elegir el agente de transporte del correo electrónico, el servidor "
 "de X y demás."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8676,8 +8705,8 @@ msgstr ""
 "simple es que un paquete requiere que otro también esté instalado para poder "
 "funcionar correctamente."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8689,8 +8718,8 @@ msgstr ""
 "una dependencia simple con GPG. Como también es una extensión de emacs tiene "
 "una dependencia simple con emacs, ya que sin él mailcrypt es inservible."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8711,8 +8740,8 @@ msgstr ""
 "sistema, y por ello todos los agentes de transporte de correo tienen una "
 "dependencia de conflicto con todos los demás."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8732,8 +8761,8 @@ msgstr ""
 "dependerán de «mail-transport-agent». Esto puede añadir confusión al "
 "intentar arreglar paquetes manualmente."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8745,94 +8774,102 @@ msgstr ""
 "asistir en la resolución de problemas de dependencias mediante un número de "
 "algoritmos automáticos que ayudan en la selección de paquetes a instalar."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> ofrece una forma sencilla de instalar paquetes desde la "
-"línea de órdenes. A diferencia de <prgn>dpkg</prgn>, <prgn>apt-get</prgn> no "
-"intenta comprender los ficheros «.deb», sino que funciona con el nombre real "
-"del paquete y sólo puede instalar ficheros «.deb» desde una <em>fuente</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"La primera <footnote><p>Si está usando un servidor proxy primero debe "
-"definir la variable de entorno http_proxy, consulte sources.list (5).</p></"
-"footnote> cosa que debería hacer antes de usar <prgn>apt-get</prgn> es "
-"obtener las listas de paquetes desde las <em>fuentes</em> para así conocer "
-"los paquetes disponibles. Puede hacer esto mediante <tt>apt-get update</tt>. "
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> ofrece una forma sencilla de instalar paquetes "
+"desde la línea de órdenes. A diferencia de <command>dpkg</command>, "
+"<command>apt-get</command> no intenta comprender los ficheros «.deb», sino "
+"que funciona con el nombre real del paquete y sólo puede instalar ficheros «."
+"deb» desde una <emphasis>fuente</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Si está usando un servidor proxy primero debe definir la variable de entorno "
+"http_proxy, consulte sources.list (5)."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"La primera <placeholder type=\"footnote\" id=\"0\"/> cosa que debería hacer "
+"antes de usar <command>apt-get</command> es obtener las listas de paquetes "
+"desde las <emphasis>fuentes</emphasis> para así conocer los paquetes "
+"disponibles. Puede hacer esto mediante <literal>apt-get update</literal>. "
 "Por ejemplo,"
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Des http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Des http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Leyendo lista de paquetes... Hecho\n"
-"Creando árbol de dependencias... Hecho"
+"Creando árbol de dependencias... Hecho\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr "Puede usar varias órdenes después de actualizar:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "«upgrade» intentará actualizar con cuidado todo el sistema. «upgrade» nunca "
 "intentará instalar un paquete nuevo o eliminar un paquete existente, y en "
 "ningún caso actualizará un paquete que pueda causar un problema de "
 "dependencias rotas a otro paquete. «upgrade» mostrará todos los paquetes que "
 "no pudo actualizar, lo cual generalmente significa que dependen de paquetes "
-"nuevos o que entran en conflicto con otro paquete. Puede usar <prgn>dselect</"
-"prgn> o <tt>apt-get install</tt> para forzar la instalación de tales "
-"paquetes."
+"nuevos o que entran en conflicto con otro paquete. Puede usar "
+"<command>dselect</command> o <literal>apt-get install</literal> para forzar "
+"la instalación de tales paquetes."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8850,33 +8887,34 @@ msgstr ""
 "dependencias con los paquetes listados, y mostrará un resumen al pedir una "
 "confirmación en caso de modificar cualquiera de los argumentos introducidos."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "«dist-upgrade» es una actualizador completo diseñado para simplificar la "
 "actualización entre publicaciones de Debian. Utiliza un sofisticado "
 "algoritmo para diseñar el mejor conjunto de paquetes a instalar, actualizar "
 "y eliminar para así obtener cuanto sea posible de la última publicación. "
 "Puede que en algunas situaciones desee usar «dist-upgrade» en lugar de pasar "
-"tiempo resolviendo dependencias con <prgn>dselect</prgn>. Puede usar "
-"<prgn>dselect</prgn> para instalar cualquier paquete que se haya quedado "
-"atrás."
+"tiempo resolviendo dependencias con <command>dselect</command>. Puede usar "
+"<command>dselect</command> para instalar cualquier paquete que se haya "
+"quedado atrás."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8884,167 +8922,163 @@ msgstr ""
 "Es importante revisar lo que «dist-upgrade» planea hacer, ya que sus "
 "decisiones a veces pueden resultar sorprendentes."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, 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 "
-#| "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 "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed 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 used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> ofrece varias opciones de línea de órdenes detalladas "
-"en su página de manual, <manref section=\"8\" name=\"apt-get\">. La opción "
-"más útil es <tt>-d</tt>, que no instala los ficheros obtenidos. Puede que no "
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> 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 <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> ofrece varias opciones de línea de órdenes "
+"detalladas en su página de manual, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. La opción más útil es "
+"<literal>-d</literal>, que no instala los ficheros obtenidos. Puede que no "
 "desee instalar los paquetes de inicio si el sistema se tiene que descargar "
-"un gran número de éstos, en caso de que algo vaya mal. Cuando usa <tt>-d</"
-"tt> puede instalar los ficheros descargados simplemente ejecutando la orden "
-"que provocó su descarga, sin <tt>-d</tt>."
+"un gran número de éstos, en caso de que algo vaya mal. Cuando usa <literal>-"
+"d</literal> puede instalar los ficheros descargados simplemente ejecutando "
+"la orden que provocó su descarga, sin <literal>-d</literal>."
 
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"El método <prgn>dselect</prgn> de APT ofrece el sistema completo de APT con "
-"la interfaz gráfica de selección de paquetes <prgn>dselect</prgn>. "
-"<prgn>dselect</prgn> se usa para seleccionar los paquetes a instalar o "
-"desinstalar que en realidad instalará APT."
+"El método <command>dselect</command> de APT ofrece el sistema completo de "
+"APT con la interfaz gráfica de selección de paquetes <command>dselect</"
+"command>. <command>dselect</command> se usa para seleccionar los paquetes a "
+"instalar o desinstalar que en realidad instalará APT."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Para habilitar el método APT tiene que seleccionar [M]étodo en "
-"<prgn>dselect</prgn>, y después seleccionar el método APT. Se le pedirá un "
-"conjunto de <em>fuentes</em>, ubicaciones de donde obtener los ficheros. "
-"Pueden ser sitios remotos de Internet, replicas locales de Debian o discos "
-"ópticos. Cada fuente puede proporcionar un fragmento del total del archivo "
-"Debian, los cuales APT combinará automáticamente para formar un conjunto "
-"completo de paquetes. Si tiene un disco óptico es una buena idea definirlo "
-"primero en el fichero de configuración y después especificar una replica "
-"para así tener acceso a los últimos arreglos de fallos. APT usará "
-"automáticamente los paquetes del disco óptico en lugar de descargarlos de "
-"Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command>, y después seleccionar el método APT. Se le "
+"pedirá un conjunto de <emphasis>fuentes</emphasis>, ubicaciones de donde "
+"obtener los ficheros. Pueden ser sitios remotos de Internet, replicas "
+"locales de Debian o discos ópticos. Cada fuente puede proporcionar un "
+"fragmento del total del archivo Debian, los cuales APT combinará "
+"automáticamente para formar un conjunto completo de paquetes. Si tiene un "
+"disco óptico es una buena idea definirlo primero en el fichero de "
+"configuración y después especificar una replica para así tener acceso a los "
+"últimos arreglos de fallos. APT usará automáticamente los paquetes del disco "
+"óptico en lugar de descargarlos de Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"La configuración de las <em>fuentes</em> comienza preguntando la base del "
-"archivo de Debian, cuyo valor predeterminado es una réplica HTTP. A "
+"La configuración de las <emphasis>fuentes</emphasis> comienza preguntando la "
+"base del archivo de Debian, cuyo valor predeterminado es una réplica HTTP. A "
 "continuación, preguntará la distribución a obtener."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"La distribución se refiere a la versión de Debian en el archivo, <em>stable</"
-"em> (estable) se refiere a la última versión publicada, y <em>unstable</em> "
-"(inestable) se refiere a la versión en desarrollo. <em>non-US</em> sólo está "
-"disponible en algunas réplicas, aquellos paquetes que contienen tecnología "
-"cifrada y otras cosas que no se pueden exportar desde los Estados Unidos. "
-"Aun así, importar estos paquetes a E.E.U.U es ilegal."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"La distribución se refiere a la versión de Debian en el archivo, "
+"<emphasis>stable</emphasis> (estable) se refiere a la última versión "
+"publicada, y <emphasis>unstable</emphasis> (inestable) se refiere a la "
+"versión en desarrollo. <emphasis>non-US</emphasis> sólo está disponible en "
+"algunas réplicas, aquellos paquetes que contienen tecnología cifrada y otras "
+"cosas que no se pueden exportar desde los Estados Unidos. Aun así, importar "
+"estos paquetes a E.E.U.U es ilegal."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -9057,8 +9091,8 @@ msgstr ""
 "«non-free» contienen paquetes con restricciones en cuanto a su uso y "
 "distribución."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -9066,23 +9100,24 @@ msgstr ""
 "Puede añadir cualquier número de fuentes, el script de configuración le "
 "preguntará por fuentes hasta que el usuario defina todo lo que quiera."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
 "Es necesario actualizar la lista disponible mediante el elemento de menú "
-"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto "
-"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
-"información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado "
-"<tt>apt-get update</tt> con anterioridad."
+"[A]ctualizar antes de iniciar <command>dselect</command>. Éste es un "
+"superconjunto de <literal>apt-get update</literal> que permite a "
+"<command>dselect</command> disponer de la información obtenida. Debe "
+"ejecutar [A]ctualizar aunque haya ejecutado <literal>apt-get update</"
+"literal> con anterioridad."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9094,77 +9129,83 @@ msgstr ""
 "[C]onfig y [R]emove carecen de significado ya que la orden [I]nstall ejecuta "
 "ambos a la vez."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Por omisión, APT eliminará automáticamente los ficheros de paquete («.deb») "
 "una vez que se hayan instalado con éxito. Para modificar este "
-"comportamiento, inserte <tt>Dselect::clean \"prompt\";</tt> en «/etc/apt/apt."
-"conf»."
+"comportamiento, inserte <literal>Dselect::clean \"prompt\";</literal> en «/"
+"etc/apt/apt.conf»."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "La interfaz"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"El método <command>dselect</command> es en realidad un conjunto de scripts "
+"en torno a <command>apt-get</command>. En realidad, el método ofrece más "
+"funcionalidad que la presente en <command>apt-get</command> por si mismo."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"El método <prgn>dselect</prgn> de APT y <prgn>apt-get</prgn> comparten la "
-"misma interfaz. Es un sencillo programa que le informa de lo que va a hacer, "
-"para después llevarlo a cabo. <footnote><p> El método <prgn>dselect</prgn> "
-"es en realidad un conjunto de scripts en torno a <prgn>apt-get</prgn>. En "
-"realidad, el método ofrece más funcionalidad que la presente en <prgn>apt-"
-"get</prgn> por si mismo. </p></footnote> Después de mostrar el resumen de lo "
-"que va a pasar APT mostrará mensajes de estado informativos para ofrecer una "
-"estimación de cuánto queda por hacer."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"El método <command>dselect</command> de APT y <command>apt-get</command> "
+"comparten la misma interfaz. Es un sencillo programa que le informa de lo "
+"que va a hacer, para después llevarlo a cabo. <placeholder type=\"footnote\" "
+"id=\"0\"/> Después de mostrar el resumen de lo que va a pasar APT mostrará "
+"mensajes de estado informativos para ofrecer una estimación de cuánto queda "
+"por hacer."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Arranque"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "APT realiza un número de acciones para preparar su estado interno antes de "
 "cualquier operación, a excepción de «update». También realiza algunas "
 "revisiones del estado del sistema. Puede llevar a cabo estas acciones en "
-"cualquier momento ejecutando <tt>apt-get check</tt>."
+"cualquier momento ejecutando <literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Leyendo lista de paquetes... Hecho\n"
-"Creando árbol de dependencias       \n"
-"Leyendo la información de estado... Hecho"
+"Creando árbol de dependencias... Hecho\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9176,21 +9217,21 @@ msgstr ""
 "más rápida la segunda vez que la ejecute. De no encontrar algún fichero de "
 "paquete, éstos se ignorarán y verá una advertencia al finalizar apt-get."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "La última acción realiza un detallado análisis de las dependencias del "
 "sistema. Revisa cada dependencia de cada paquete instalado o sin "
 "desempaquetar analiza su validación. En caso de error aparecerá un informe, "
-"y <prgn>apt-get</prgn> se negará a ejecutarse."
+"y <command>apt-get</command> se negará a ejecutarse."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9200,34 +9241,33 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Leyendo lista de paquetes... Hecho\n"
-"Creando árbol de dependencias       \n"
-"Leyendo la información de estado... Hecho\n"
-"Tal vez quiera ejecutar `apt-get -f install' para corregirlo.\n"
+"Creando árbol de dependencias... Hecho\n"
+"Tal vez quiera ejecutar 'apt-get -f install' para corregirlo.\n"
 "Los siguientes paquetes tienen dependencias incumplidas:\n"
 "  9fonts: Depende: xlib6g pero no está instalado\n"
 "  uucp: Depende: mailx pero no está instalado\n"
-"  blast: Depende: xlib6g (>= 3.3-5) pero no está instalado\n"
+"  blast: Depende: xlib6g (&gt;= 3.3-5) pero no está instalado\n"
 "  adduser: Depende: perl-base pero no está instalado\n"
 "  aumix: Depende: libgpmg1 pero no está instalado\n"
 "  debiandoc-sgml: Depende: sgml-base pero no está instalado\n"
-"  bash-builtins: Depende: bash (>= 2.01) pero 2.0-3 está instalado\n"
+"  bash-builtins: Depende: bash (&gt;= 2.01) pero 2.0-3 está instalado\n"
 "  cthugha: Depende: svgalibg1 pero no está instalado\n"
-"           Depende: xlib6g (>= 3.3-5) pero no está instalado\n"
-"  libreadlineg2: Entra en conflicto:libreadline2 (<< 2.1-2.1)"
+"           Depende: xlib6g (&gt;= 3.3-5) pero no está instalado\n"
+"  libreadlineg2: Entra en conflicto:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9241,86 +9281,95 @@ msgstr ""
 "dependencias no satisfechas. También incluye una explicación de porqué el "
 "paquete tiene un problema de dependencias."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"APT, de todas formas, considera todas las dependencias conocidas e intenta "
+"prevenir paquetes rotos"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Hay dos formas de que el sistema tenga un estado roto como éste. El primero "
-"es causado por la omisión de <prgn>dpkg</prgn> de ciertas relaciones "
-"delicadas entre paquetes al realizar una actualización. <footnote><p>APT, de "
-"todas formas, considera todas las dependencias conocidas e intenta prevenir "
-"paquetes rotos</p></footnote>. El segundo ocurre se la instalación de un "
-"paquete falla durante la operación. En esta situación puede que un paquete "
-"se haya desempaquetado sin que sus dependencias estuviesen instaladas "
-"previamente."
+"es causado por la omisión de <command>dpkg</command> de ciertas relaciones "
+"delicadas entre paquetes al realizar una actualización. <placeholder type="
+"\"footnote\" id=\"0\"/>. El segundo ocurre se la instalación de un paquete "
+"falla durante la operación. En esta situación puede que un paquete se haya "
+"desempaquetado sin que sus dependencias estuviesen instaladas previamente."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "La segunda situación es mucho menos grave que la primera ya que APT define "
 "ciertos límites en el orden de instalación de los paquetes. En ambos casos, "
-"introducir la opción <tt>-f</tt> a <prgn>apt-get</prgn> causará que APT "
-"deduzca una posible solución al problema para después continuar. El método "
-"<prgn>dselect</prgn> de APT siempre ofrece la opción <tt>-f</tt> para "
-"permitir una fácil continuación cuando existen scripts fallidos del "
-"mantenedor."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Aún así, de usar la opción <tt>-f</tt> para corregir un sistema gravemente "
-"roto por el primer caso cabe que la acción falle inmediatamente o que la "
-"secuencia de instalación se interrumpa. En cualquier caso es necesario usar "
-"dpkg manualmente (puede que con opciones de forzado) para corregir la "
-"situación lo suficiente como para que APT pueda continuar."
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"introducir la opción <literal>-f</literal> a <command>apt-get</command> "
+"causará que APT deduzca una posible solución al problema para después "
+"continuar. El método <command>dselect</command> de APT siempre ofrece la "
+"opción <literal>-f</literal> para permitir una fácil continuación cuando "
+"existen scripts fallidos del mantenedor."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Aún así, de usar la opción <literal>-f</literal> para corregir un sistema "
+"gravemente roto por el primer caso cabe que la acción falle inmediatamente o "
+"que la secuencia de instalación se interrumpa. En cualquier caso es "
+"necesario usar dpkg manualmente (puede que con opciones de forzado) para "
+"corregir la situación lo suficiente como para que APT pueda continuar."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "El informe de estado"
 
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-"Antes de proceder <prgn>apt-get</prgn> presentará un informe de lo que va a "
-"ocurrir. Generalmente el informe refleja el tipo de operación a realizar, "
-"pero hay ciertos elementos comunes. La lista refleja el estado final de las "
-"cosas en todos los casos, teniendo en cuenta la opción <tt>-f</tt> y "
-"cualquier otra actividad relevante a la orden ejecutada."
-
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
+msgid ""
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
+msgstr ""
+"Antes de proceder <command>apt-get</command> presentará un informe de lo que "
+"va a ocurrir. Generalmente el informe refleja el tipo de operación a "
+"realizar, pero hay ciertos elementos comunes. La lista refleja el estado "
+"final de las cosas en todos los casos, teniendo en cuenta la opción "
+"<literal>-f</literal> y cualquier otra actividad relevante a la orden "
+"ejecutada."
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "La lista de paquetes extras"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9328,85 +9377,85 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Se instalarán los siguientes paquetes extras:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "La lista de paquetes extras muestra todos los paquetes que se van a instalar "
 "o actualizar en adición a aquellos mencionados en la línea de órdenes. Sólo "
-"se genera para la orden <tt>install</tt>. Generalmente, los paquetes "
-"listados son el resultado de una instalación automática."
+"se genera para la orden <literal>install</literal>. Generalmente, los "
+"paquetes listados son el resultado de una instalación automática."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "Los paquetes a eliminar"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Los siguientes paquetes se ELIMINAR�N:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "La lista de paquetes a eliminar muestra todos los paquetes que se van a "
 "eliminar del sistema. Puede aparecer durante cualquier operación, y se "
 "debería revisar cuidadosamente para asegurar que no se va a eliminar nada "
-"importante. La opción <tt>-f</tt> puede generar varios paquetes a eliminar "
-"así que se debe utilizar con precaución. La lista puede contener paquetes a "
-"eliminar porque están parcialmente instalados, posiblemente debido a una "
-"instalación interrumpida."
+"importante. La opción <literal>-f</literal> puede generar varios paquetes a "
+"eliminar así que se debe utilizar con precaución. La lista puede contener "
+"paquetes a eliminar porque están parcialmente instalados, posiblemente "
+"debido a una instalación interrumpida."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "La lista de paquetes nuevos"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Se instalarán los siguientes paquetes NUEVOS:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9416,57 +9465,57 @@ msgstr ""
 "Los paquetes listados no se encuentran instalados en el sistema pero lo "
 "estarán cuando APT finalice."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "La lista de paquetes retenidos"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Los siguientes paquetes se han retenido:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Puede que al actualizar el sistema por completo no se puedan instalar "
 "versiones nuevas de paquetes porque requieren nuevos elementos que entran en "
 "conflicto con paquetes ya instalados. En este caso, el paquete aparecerá en "
 "la lista de paquetes retenidos. La mejor manera de instalar paquetes "
-"listados aquí es mediante <tt>apt-get install</tt> o mediante <prgn>dselect</"
-"prgn> para así resolver esos problemas."
+"listados aquí es mediante <literal>apt-get install</literal> o mediante "
+"<command>dselect</command> para así resolver esos problemas."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "Advertencia de paquetes retenidos"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Se cambiarán los siguientes paquetes retenidos:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9476,33 +9525,33 @@ msgstr ""
 "verá una advertencia de que el paquete retenido se va a modificar. Esto sólo "
 "debería ocurrir durante un «dist-upgrade» o un «install»."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Resumen final"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Por último, APT mostrará un resumen de los cambios que se llevarán a cabo."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 paquetes actualizados, 8 se instalarán, 23 para eliminar y 51 no\n"
 "actualizados.\n"
 "12 paquetes no instalados del todo o eliminados.\n"
-"Se necesita descargar 65.7M/66.7M de archivos. Se usarán 26.5M después de desempaquetar."
+"Se necesita descargar 65.7M/66.7M de archivos. Se usarán 26.5M después de desempaquetar.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9533,8 +9582,8 @@ msgstr ""
 "paquetes a eliminar el valor puede indicar la cantidad de espacio que se va "
 "a liberar."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9542,13 +9591,13 @@ msgstr ""
 "Puede generar otros informes con la opción «-u» para mostrar los paquetes a "
 "actualizar, similar a los ejemplos anteriores."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "La pantalla de estado"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9556,8 +9605,8 @@ msgstr ""
 "APT muestra una serie de mensajes de estado en el transcurso de descargar "
 "ficheros de paquete y archivo."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9566,7 +9615,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Des:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9574,70 +9623,73 @@ msgstr ""
 "Obj http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Des:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "es:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free Esperando las cabeceras 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free Esperando las cabeceras 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Las líneas comenzando con <em>Des</em> aparecen cuando APT inicia la "
-"obtención de un fichero, mientras que la última línea indica el progreso de "
-"la descarga. El primer valor porcentual en la barra de progreso indica el "
-"porcentaje total de los ficheros ya descargados. Desafortunadamente, <tt>apt-"
-"get update</tt> desconoce el tamaño de los ficheros de paquete y por ello "
-"genera una estimación que puede ser inexacta."
+"Las líneas comenzando con <emphasis>Des</emphasis> aparecen cuando APT "
+"inicia la obtención de un fichero, mientras que la última línea indica el "
+"progreso de la descarga. El primer valor porcentual en la barra de progreso "
+"indica el porcentaje total de los ficheros ya descargados. "
+"Desafortunadamente, <literal>apt-get update</literal> desconoce el tamaño de "
+"los ficheros de paquete y por ello genera una estimación que puede ser "
+"inexacta."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "La siguiente sección de la línea de estado se repite por cada instancia de "
 "descarga e indica la operación realizada, así como información útil relativa "
-"a lo que está pasando. Puede que esta sección sólo muestre <em>Forking</em>, "
-"lo cual significa que el sistema operativo está cargando el módulo de "
-"descargas. La primera palabra después de «[» es el número de obtención tal y "
-"como se muestra en la línea del histórico. La siguiente palabra es la forma "
-"corta del nombre del objeto en descarga. Al conectarse con los archivos, "
-"contendrá el nombre del paquete obtenido."
+"a lo que está pasando. Puede que esta sección sólo muestre "
+"<emphasis>Forking</emphasis>, lo cual significa que el sistema operativo "
+"está cargando el módulo de descargas. La primera palabra después de «[» es "
+"el número de obtención tal y como se muestra en la línea del histórico. La "
+"siguiente palabra es la forma corta del nombre del objeto en descarga. Al "
+"conectarse con los archivos, contendrá el nombre del paquete obtenido."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "Una cadena informativa aparecerá entre comillas simples indicando el "
 "progreso de la fase de negociación de la descarga. Generalmente progresa de "
-"<em>Conectando</em> a <em>Esperando fichero</em>, finalizando con "
-"<em>Descargando</em> o <em>Continuando</em>. El último valor es el número de "
-"bytes descargados desde el sitio remoto. Una vez que la descarga arranque se "
-"representará como <tt>102/10.2k</tt> indicando que ya se han obtenido 102 "
-"bytes y que se esperan 10.2 kilobytes. El tamaño total siempre aparece con "
-"la notación de la figura 4 para conservar espacio. A continuación aparece un "
+"<emphasis>Conectando</emphasis> a <emphasis>Esperando fichero</emphasis>, "
+"finalizando con <emphasis>Descargando</emphasis> o <emphasis>Continuando</"
+"emphasis>. El último valor es el número de bytes descargados desde el sitio "
+"remoto. Una vez que la descarga arranque se representará como "
+"<literal>102/10.2k</literal> indicando que ya se han obtenido 102 bytes y "
+"que se esperan 10.2 kilobytes. El tamaño total siempre aparece con la "
+"notación de la figura 4 para conservar espacio. A continuación aparece un "
 "medidor porcentual del fichero. El penúltimo elemento es la media "
 "instantánea de velocidad. Estos valores se actualizan cada 5 segundos y "
 "reflejan la tasa de descarga de datos de ese periodo. Por último puede ver "
@@ -9645,56 +9697,51 @@ msgstr ""
 "refleja el tiempo restante para completar todo tal y como se ve en la tasa "
 "de transferencia visible."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "La pantalla de estado se actualiza cada medio segundo para ofrecer una "
 "constante información del progreso de la descarga, mientras que las líneas "
 "«Des» se desplazan hacia atrás cuando se inicia la descarga de otro fichero. "
 "Ya que la pantalla de estado se actualiza constantemente carece de utilidad "
-"para su registro en un fichero. Puede usar la opción <tt>-q</tt> para omitir "
-"la pantalla de estado."
+"para su registro en un fichero. Puede usar la opción <literal>-q</literal> "
+"para omitir la pantalla de estado."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT usa <prgn>dpkg</prgn> para instalar ficheros, y pasará a interactuar con "
-"<prgn>dpkg</prgn> al finalizar la descarga. <prgn>dpkg</prgn> también "
-"planteará un número de preguntas a medida que procesa los paquetes, los "
-"cuales también pueden formular preguntas. A cada pregunta generalmente le "
-"precede una descripción de la pregunta en sí. Éstas son demasiado variadas "
-"como para poder tratarlas aquí en su totalidad."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT usa <command>dpkg</command> para instalar ficheros, y pasará a "
+"interactuar con <command>dpkg</command> al finalizar la descarga. "
+"<command>dpkg</command> también planteará un número de preguntas a medida "
+"que procesa los paquetes, los cuales también pueden formular preguntas. A "
+"cada pregunta generalmente le precede una descripción de la pregunta en sí. "
+"Éstas son demasiado variadas como para poder tratarlas aquí en su totalidad."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "Uso de APT Offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9702,23 +9749,25 @@ msgstr ""
 "Este documento describe el uso de APT en un entorno sin conexión a red, "
 "específicamente una aproximación «sneaker-net» a la tarea de actualización."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Introducción"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Resumen"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9731,8 +9780,8 @@ msgstr ""
 "de un módem, y otra máquina físicamente lejos dispone de una conexión muy "
 "rápida."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9740,9 +9789,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "La solución a esto es usar dispositivos extraíbles de gran capacidad tales "
 "como un disco Zip o uno SuperDisk. Estos discos no tienen la suficiente "
@@ -9752,11 +9801,12 @@ msgstr ""
 "almacenarlos en un disco usando el sistema que tiene una conexión rápida. Es "
 "incluso posible usar otro sistema Debian con APT, o usar un sistema "
 "operativo totalmente distinto junto con una herramienta de descarga como "
-"wget. Digamos que el <em>sistema remoto</em> es aquél que descarga los "
-"paquetes, y <em>sistema destino</em> es aquél con poca o ninguna conexión."
+"wget. Digamos que el <emphasis>sistema remoto</emphasis> es aquél que "
+"descarga los paquetes, y <emphasis>sistema destino</emphasis> es aquél con "
+"poca o ninguna conexión."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9769,13 +9819,13 @@ msgstr ""
 "de un sistema de ficheros capaz de gestionar nombres largos de ficheros, "
 "tales como ext2, fat32 o vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "Uso de APT en ambas máquinas"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9788,8 +9838,8 @@ msgstr ""
 "paquete y decidir qué paquetes descargar. La estructura de directorios del "
 "disco debería tener este aspecto:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9799,7 +9849,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9808,42 +9858,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "El fichero de configuración"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "El fichero de configuración debería indicar a APT que guarde los ficheros en "
 "el disco, y también utilizar los ficheros de configuración en el disco. El "
 "fichero «sources.list» debería contener los sitios apropiados que desea "
 "utilizar desde el sistema remoto, y el fichero de estado debería ser una "
-"copia de <em>/var/lib/dpkg/status</em> del <em>sistema destino</em>. Tenga "
-"en cuenta que si usa un archivo local debe usar el URI «copy», de idéntica "
-"sintaxis al URI «file»."
+"copia de <emphasis>/var/lib/dpkg/status</emphasis> del <emphasis>sistema "
+"destino</emphasis>. Tenga en cuenta que si usa un archivo local debe usar el "
+"URI «copy», de idéntica sintaxis al URI «file»."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt-conf</em> debe contener toda la información necesaria para que APT "
-"use el disco:"
+"<emphasis>apt-conf</emphasis> debe contener toda la información necesaria "
+"para que APT use el disco:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9851,10 +9902,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9865,20 +9916,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Esto no es necesario si ambos sistemas tienen la misma arquitectura,\n"
 "      informa al APT remoto la arquitectura del sistema destino */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use el disco para información de estado y redireccionar el fichero de\n"
@@ -9889,67 +9940,70 @@ msgstr ""
 "   // Los cachés binarios se guardan localmente\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Ubicación del fichero de fuentes.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Para más detalles consulte la página de manual y el fichero de configuración "
-"de ejemplo en <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"de ejemplo en <emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Lo primero que debe hacer en el sistema destino es montar el disco y guardar "
-"en él una copia de <em>/var/lib/dpkg/status</em>. También debe crear los "
-"directorios definidos en el Resumen, <em>archives/partial/</em> y <em>lists/"
-"partial/</em>. Después, lleve el disco hasta el sistema remoto y configure "
-"«sources.list». Ejecute lo siguiente en el sistema remoto:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"en él una copia de <emphasis>/var/lib/dpkg/status</emphasis>. También debe "
+"crear los directorios definidos en el Resumen, <emphasis>archives/partial/</"
+"emphasis> y <emphasis>lists/partial/</emphasis>. Después, lleve el disco "
+"hasta el sistema remoto y configure «sources.list». Ejecute lo siguiente en "
+"el sistema remoto:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT obtiene los ficheros de paquete ]\n"
 " # apt-get dist-upgrade\n"
 " [ APT obtiene todos los paquetes necesarios para actualizar el sistema\n"
-" destino ]"
+" destino ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Puede reemplazar la orden «dist-upgrade» con cualquiera otra orden estándar "
 "de APT, en especial «dselect-upgrade». Incluso puede usar una interfaz de "
-"APT como <em>dselect</em>. Sin embargo, esto presenta un problema al "
-"informar después de sus selecciones al sistema remoto."
+"APT como <emphasis>dselect</emphasis>. Sin embargo, esto presenta un "
+"problema al informar después de sus selecciones al sistema remoto."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9957,24 +10011,24 @@ msgstr ""
 "Ahora el disco contiene todos los ficheros de índice y archivo necesarios "
 "para actualizar el sistema destino. Inserte el disco otra vez y ejecute:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT genera una copia local de los ficheros de caché ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ O cualquiera otra orden de APT ]"
+"  [ O cualquiera otra orden de APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9982,8 +10036,8 @@ msgstr ""
 "Para un correcto funcionamiento debe definir nuevamente el fichero de estado "
 "local. Tiene una importancia crucial."
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9997,24 +10051,25 @@ msgstr ""
 "en el sistema local, aunque puede que no sea posible. NO copie el fichero de "
 "estado si dpkg o APT se han ejecutado mientras tanto."
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "Uso de APT y wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> es una herramienta de descarga muy popular que funciona "
-"prácticamente en cualquier sistema. A diferencia del método anterior, "
-"requiere que el sistema Debian tenga una lista de paquetes disponibles."
+"<emphasis>wget</emphasis> es una herramienta de descarga muy popular que "
+"funciona prácticamente en cualquier sistema. A diferencia del método "
+"anterior, requiere que el sistema Debian tenga una lista de paquetes "
+"disponibles."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -10026,13 +10081,13 @@ msgstr ""
 "get «--print-uris», para después preparar un script de wget que finalmente "
 "obtendrá los paquetes."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Operación"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -10041,23 +10096,23 @@ msgstr ""
 "configuración especial. Solo se utilizan órdenes estándar de APT para "
 "generar el fichero con la lista."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Pulse no cuando se le pregunte, asegúrese de estar conforme con las\n"
 " acciones ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -10065,8 +10120,8 @@ msgstr ""
 "Se puede utilizar cualquier otra orden aparte de «dist-upgrade», incluyendo "
 "«dselect-upgrade»."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10078,25 +10133,25 @@ msgstr ""
 "ejecutar en el directorio del punto de montaje del disco para poder guardar "
 "la salida en el disco."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "El sistema remoto haría algo como"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10104,14 +10159,14 @@ msgstr ""
 "Una vez que los archivos se han descargado y el disco está finalmente "
 "conectado al sistema Debian, ejecute la instalación con lo siguiente."
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index e0c251751..f94f0e07a 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-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-04 01:28+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -610,37 +610,37 @@ msgid ""
 msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: 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
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: 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
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Description"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -649,7 +649,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -658,14 +658,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 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
+#: apt.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
@@ -678,14 +678,14 @@ msgstr ""
 "dépendances inverses d'un paquet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 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
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -702,7 +702,7 @@ msgstr ""
 "unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -718,14 +718,14 @@ msgstr ""
 "d'être supprimé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 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
+#: apt.8.xml:95
 #, fuzzy
 #| msgid ""
 #| "<literal>showhold</literal> is used to print a list of packages on hold "
@@ -738,16 +738,16 @@ msgstr ""
 "de manière analogue aux commandes de même type."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
 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."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 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 "
@@ -755,19 +755,19 @@ msgid ""
 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
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "options"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 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 "
@@ -777,12 +777,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 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 "
@@ -790,28 +790,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 #, 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
+#: apt.8.xml:151
 #, 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
+#: apt.8.xml:155
 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
+#: apt.8.xml:160
 #, fuzzy
 #| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
@@ -820,16 +820,16 @@ msgid ""
 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
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "Voir aussi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -844,14 +844,14 @@ msgstr ""
 "« 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
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
@@ -864,13 +864,13 @@ msgstr ""
 "décimal 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 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
+#: apt-get.8.xml:35
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> is the command-line tool for handling "
@@ -889,8 +889,8 @@ msgstr ""
 "existent, comme &dselect;, &aptitude;, &synaptic; and &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
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -899,7 +899,7 @@ msgstr ""
 "donnée, l'une des commandes suivantes doit être présente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -924,7 +924,7 @@ msgstr ""
 "ne peut être connue à l'avance."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -950,7 +950,7 @@ msgstr ""
 "l'existence de nouvelles versions des paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -974,7 +974,7 @@ msgstr ""
 "un mécanisme de remplacement des paramètres généraux pour certains paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -992,7 +992,7 @@ msgstr ""
 "installation de nouveaux paquets)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -1021,7 +1021,7 @@ 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:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1031,7 +1031,7 @@ msgstr ""
 "avec précaution."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -1051,7 +1051,7 @@ msgstr ""
 "comme décrit plus haut) sera récupérée et installée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1060,7 +1060,7 @@ msgstr ""
 "l'installation des paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -1081,7 +1081,7 @@ msgstr ""
 "d'utiliser une expression plus précise."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1092,7 +1092,7 @@ msgstr ""
 "de configuration sont également effacés)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1111,7 +1111,7 @@ msgstr ""
 "par paquet avec la syntaxe <literal>paquet/version</literal> si possible."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1127,7 +1127,7 @@ msgstr ""
 "installé ou que vous voulez installer."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1142,7 +1142,7 @@ msgstr ""
 "décompacté."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -1157,7 +1157,7 @@ msgstr ""
 "Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1169,7 +1169,7 @@ msgstr ""
 "les archives tar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1184,7 +1184,7 @@ msgstr ""
 "indiquée avec l'option <option>--host-architecture</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1193,7 +1193,7 @@ msgstr ""
 "jour le cache des paquets et cherche les dépendances défectueuses."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1202,7 +1202,7 @@ msgstr ""
 "répertoire courant."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 #, fuzzy
 #| msgid ""
 #| "<literal>clean</literal> clears out the local repository of retrieved "
@@ -1227,7 +1227,7 @@ msgstr ""
 "temps en temps si l'on veut libérer de l'espace disque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1246,7 +1246,7 @@ msgstr ""
 "installés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1257,7 +1257,7 @@ msgstr ""
 "ne sont plus nécessaires."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1281,7 +1281,7 @@ msgstr ""
 "<option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1290,7 +1290,7 @@ msgstr ""
 "Élément de configuration : <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1299,7 +1299,7 @@ msgstr ""
 "de configuration : <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1309,7 +1309,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 #, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -1350,7 +1350,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1370,7 +1370,7 @@ msgstr ""
 "<literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1382,7 +1382,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1404,7 +1404,7 @@ msgstr ""
 "configuration : <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1415,7 +1415,7 @@ msgstr ""
 "<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1436,7 +1436,7 @@ msgstr ""
 "notifications)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1451,7 +1451,7 @@ msgstr ""
 "que les dommages n'ont aucune conséquence (rare)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1467,7 +1467,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1476,7 +1476,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1486,7 +1486,7 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1495,7 +1495,7 @@ msgstr ""
 "Élément de configuration : <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1521,7 +1521,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1546,7 +1546,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1555,7 +1555,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1569,7 +1569,7 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1581,7 +1581,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1594,7 +1594,7 @@ msgstr ""
 "Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1607,7 +1607,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1623,7 +1623,7 @@ msgstr ""
 "yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1645,7 +1645,7 @@ msgstr ""
 "<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 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. "
@@ -1659,7 +1659,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1668,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:462
+#: apt-get.8.xml:456
 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 "
@@ -1686,7 +1686,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1708,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:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1722,7 +1722,7 @@ msgstr ""
 "Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1732,7 +1732,7 @@ msgstr ""
 "Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1745,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:507
+#: apt-get.8.xml:501
 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 "
@@ -1765,7 +1765,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 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</"
@@ -1777,7 +1777,7 @@ msgstr ""
 "literal>, "
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1787,7 +1787,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 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::"
@@ -1799,7 +1799,7 @@ msgstr ""
 "AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1809,13 +1809,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Fichiers"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1831,7 +1831,7 @@ msgstr ""
 "« HOWTO » d'APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1840,12 +1840,12 @@ msgstr ""
 "décimal 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "recherche dans le cache d'APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1858,7 +1858,7 @@ msgstr ""
 "desquelles il extrait les informations intéressantes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1868,14 +1868,14 @@ msgstr ""
 "ou obsolète."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1899,7 +1899,7 @@ msgstr ""
 "résultat :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1925,7 +1925,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -1944,7 +1944,7 @@ msgstr ""
 "consulter le code source d'APT."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1954,7 +1954,7 @@ msgstr ""
 "rapportées :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1963,7 +1963,7 @@ msgstr ""
 "le cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1976,7 +1976,7 @@ msgstr ""
 "dépendance. La majorité des paquets appartient à cette catégorie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -1994,7 +1994,7 @@ msgstr ""
 "n'existe aucun paquet nommé « mail-transport-agent »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2007,7 +2007,7 @@ msgstr ""
 "« xless » remplit « X11-text-viewer »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2020,7 +2020,7 @@ msgstr ""
 "paquet réel et il est aussi fourni par « debconf-tiny »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2035,7 +2035,7 @@ msgstr ""
 "Habituellement on les trouve dans les champs « Conflicts » ou « Breaks »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -2050,7 +2050,7 @@ msgstr ""
 "considérablement plus grande que le nombre total de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2059,7 +2059,7 @@ msgstr ""
 "dépendances déclarées par tous les paquets présents dans le cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2070,7 +2070,7 @@ msgstr ""
 "les entrées qui déclarent que ces noms correspondent à des paquets binaires."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2079,7 +2079,7 @@ msgstr ""
 "paquet du cache. Elle est d'abord destinée au débogage."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2089,7 +2089,7 @@ msgstr ""
 "et la méthode &dselect; s'en sert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2098,7 +2098,7 @@ msgstr ""
 "dépendances absentes dans le cache de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2108,12 +2108,12 @@ msgstr ""
 "argument."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2134,7 +2134,7 @@ msgstr ""
 "mais seulement dans les noms de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2143,7 +2143,7 @@ msgstr ""
 "rationnelles différentes sur lesquelles seront réalisées un « et » logique."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2153,7 +2153,7 @@ msgstr ""
 "satisfont ces dépendances."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2162,12 +2162,12 @@ msgstr ""
 "dépendances inverses d'un paquet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -2182,7 +2182,7 @@ msgstr ""
 "l'option <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -2193,7 +2193,7 @@ msgstr ""
 "affichés dans la liste créée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2215,7 +2215,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2230,14 +2230,14 @@ msgstr ""
 "conflits."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Attention, dotty ne peut pas représenter des ensembles très grands de "
 "paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2247,12 +2247,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -2265,7 +2265,7 @@ msgstr ""
 "paquet donné en argument."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -2285,7 +2285,7 @@ msgstr ""
 "literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2296,7 +2296,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2312,7 +2312,7 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2327,7 +2327,7 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2339,7 +2339,7 @@ msgstr ""
 "<literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2354,7 +2354,7 @@ msgstr ""
 "replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2364,7 +2364,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2382,7 +2382,7 @@ msgstr ""
 "<literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2394,7 +2394,7 @@ msgstr ""
 "configuration : <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2404,7 +2404,7 @@ msgstr ""
 "NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2415,7 +2415,7 @@ msgstr ""
 "configuration : <literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2427,7 +2427,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2438,12 +2438,12 @@ msgstr ""
 "Élément de configuration : <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2452,12 +2452,12 @@ msgstr ""
 "nombre décimal 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "Utilitaire de gestion des clés d'APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -2467,12 +2467,12 @@ msgstr ""
 "les paquets. Les paquets authentifiés par ces clés seront réputés fiables."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Commandes"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2483,32 +2483,32 @@ msgstr ""
 "si le nom de fichier est <literal>-</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "Supprimer une clé de la liste des clés fiables."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Afficher la clé &synopsis-param-keyid; sur la sortie standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "Afficher toutes les clés fiables sur la sortie standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "Afficher la liste des clés fiables."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "Afficher les empreintes des clés fiables."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2517,7 +2517,7 @@ msgstr ""
 "possible de télécharger une clé publique."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2531,7 +2531,7 @@ msgstr ""
 "&keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2549,12 +2549,12 @@ msgstr ""
 "place. Par contre, la version d'Ubuntu permet de l'utiliser."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Options"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2563,7 +2563,7 @@ msgstr ""
 "décrites dans la section suivante."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2580,47 +2580,47 @@ msgstr ""
 "les nouvelles clés y seront ajoutées."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "Base de données locale de fiabilité des clés de l'archive."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Trousseau des clés fiables de l'archive &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr "Trousseau des clés fiables supprimées de l'archive &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "Indiquer si un paquet a été installé automatiquement ou non"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2629,7 +2629,7 @@ msgstr ""
 "a été automatiquement installé ou pas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -2645,7 +2645,7 @@ msgstr ""
 "command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2656,7 +2656,7 @@ msgstr ""
 "aucun paquet installé manuellement ne dépend de lui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2667,7 +2667,7 @@ msgstr ""
 "aucun autre paquet n'en dépend."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2682,7 +2682,7 @@ msgstr ""
 "non affecté par l'option <option>--file</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2692,7 +2692,7 @@ msgstr ""
 "liée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2706,7 +2706,7 @@ msgstr ""
 "affichés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2717,7 +2717,7 @@ msgstr ""
 "manuellement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2726,7 +2726,7 @@ msgstr ""
 "de manière analogue aux commandes de même type."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2739,7 +2739,7 @@ msgstr ""
 "literal>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2748,12 +2748,12 @@ msgstr ""
 "autre chiffre en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "Gestion de l'authentification d'archive avec APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -2766,7 +2766,7 @@ msgstr ""
 "la clé de la signature du fichier Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 msgid ""
 "If a package comes from a archive without a signature, or with a signature "
 "that apt does not have a key for, that package is considered untrusted, and "
@@ -2782,7 +2782,7 @@ msgstr ""
 "vérification des sources avant tout téléchargement de paquet."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2791,12 +2791,12 @@ msgstr ""
 "fonction de certification."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Trusted archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2813,7 +2813,7 @@ msgstr ""
 "en sorte que l'archive soit fiable."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2826,7 +2826,7 @@ msgstr ""
 "verify et devscripts."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. In order to become "
@@ -2844,7 +2844,7 @@ msgstr ""
 "l'identité des propriétaires de la clé."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 #, fuzzy
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
@@ -2865,7 +2865,7 @@ msgstr ""
 "miroirs. Les clés sont fournies par le paquet &keyring-package;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2877,7 +2877,7 @@ msgstr ""
 "automatiquement."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2886,7 +2886,7 @@ msgstr ""
 "paquet. Elle vise à empêcher deux types d'attaque possibles :"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2901,7 +2901,7 @@ msgstr ""
 "trafic vers un serveur fourbe (par usurpation d'adresses)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2914,7 +2914,7 @@ msgstr ""
 "paquets de ce miroir propagent du code malveillant."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2927,12 +2927,12 @@ msgstr ""
 "signature des paquets."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Configuration utilisateur"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys, although an installation of "
@@ -2945,7 +2945,7 @@ msgstr ""
 "Debian et les différents répertoires de paquets."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2962,12 +2962,12 @@ msgstr ""
 "l'archive que vous avez configurée."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Configuration d'une archive"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2976,7 +2976,7 @@ msgstr ""
 "devez :"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2987,7 +2987,7 @@ msgstr ""
 "ftparchive release</command> (fournie dans le paquet apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2998,7 +2998,7 @@ msgstr ""
 "command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -3009,7 +3009,7 @@ msgstr ""
 "authentifier les fichiers de l'archive."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3019,16 +3019,16 @@ msgstr ""
 "les deux premières étapes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3045,12 +3045,12 @@ msgstr ""
 "Distribution HOWTO</ulink> par V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Auteurs des pages de manuel"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -3059,12 +3059,12 @@ msgstr ""
 "Peña, Isaac Jones, Colin Walters, Florian Weimer et Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "Utilitaire de gestion des CD d'APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3077,7 +3077,7 @@ msgstr ""
 "gravure et de vérifier les fichiers d'index."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -3089,7 +3089,7 @@ msgstr ""
 "pour prendre en compte de possibles erreurs de gravure."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3104,7 +3104,7 @@ msgstr ""
 "titre descriptif est demandé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3115,7 +3115,7 @@ msgstr ""
 "identifiants dans <filename>&statedir;/cdroms.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3124,7 +3124,7 @@ msgstr ""
 "le nom du fichier stocké."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 #, fuzzy
 #| msgid ""
 #| "Mount point; specify the location to mount the CD-ROM. This mount point "
@@ -3141,7 +3141,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 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.  "
@@ -3153,7 +3153,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3165,7 +3165,7 @@ msgstr ""
 "<literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3176,7 +3176,7 @@ msgstr ""
 "NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3190,7 +3190,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3202,7 +3202,7 @@ msgstr ""
 "le CD mais tous les paquets seront repérés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3213,12 +3213,12 @@ msgstr ""
 "<literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3227,12 +3227,12 @@ msgstr ""
 "nombre décimal 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "Programme d'interrogation de la configuration d'APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3246,7 +3246,7 @@ msgstr ""
 "apt.conf</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -3262,7 +3262,7 @@ msgstr ""
 "cette commande devrait être utilisée comme suit :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3274,7 +3274,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3283,7 +3283,7 @@ msgstr ""
 "MyApp::Options ou, par défaut, la valeur -f."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -3295,12 +3295,12 @@ msgstr ""
 "vérifiée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Affiche seulement le contenu de l'espace de configuration."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3310,12 +3310,12 @@ msgstr ""
 "ce qui est retourné."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3333,13 +3333,13 @@ msgstr ""
 "caractère &percnt; peut être affiché avec &percnt;&percnt; ."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3348,27 +3348,27 @@ msgstr ""
 "le nombre 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Documentation initiale de Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "Fichier de configuration pour APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3382,7 +3382,7 @@ msgstr ""
 "environnement d'utilisation uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3391,7 +3391,7 @@ msgstr ""
 "configuration dans l'ordre suivant :"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3400,7 +3400,7 @@ msgstr ""
 "elle existe"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3421,14 +3421,14 @@ msgstr ""
 "configuration étant, eux, ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 "le fichier de configuration défini par <literal>Dir::Etc::Main</literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3438,12 +3438,12 @@ msgstr ""
 "configuration."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Syntaxe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3458,7 +3458,7 @@ msgstr ""
 "Get. Il n'y a pas d'héritage des options des groupes parents."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3485,7 +3485,7 @@ msgstr ""
 "accolades, comme suit :"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3503,7 +3503,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -3515,13 +3515,13 @@ msgstr ""
 "incluses, séparées par des points-virgules."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3530,7 +3530,7 @@ msgstr ""
 "de configuration."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3540,7 +3540,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3556,7 +3556,7 @@ msgstr ""
 "réaffectant une valeur."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3576,7 +3576,7 @@ msgstr ""
 "également se terminer avec un point-virgule."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3592,7 +3592,7 @@ msgstr ""
 "peuvent être remplacés mais seulement effacés."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3611,7 +3611,7 @@ msgstr ""
 "champ d'action (« scope ») ne peut pas être indiquée à la ligne de commande."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3643,12 +3643,12 @@ msgstr ""
 "explicitement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "Le groupe APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3657,7 +3657,7 @@ msgstr ""
 "également des options communes à tous les outils."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3668,7 +3668,7 @@ msgstr ""
 "valeur interne par défaut est l'architecture pour laquelle APT a été compilé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3690,7 +3690,7 @@ msgstr ""
 "sont enregistrées avec <command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3699,7 +3699,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3713,7 +3713,7 @@ msgstr ""
 "&apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3723,7 +3723,7 @@ msgstr ""
 "décision."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -3737,7 +3737,7 @@ msgstr ""
 "direct pour les réinstaller."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 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 "
@@ -3764,7 +3764,7 @@ msgstr ""
 "dépendances ne sont pas satisfaites."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3793,7 +3793,7 @@ msgstr ""
 "le seul qu'elle permet d'éviter."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 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 "
@@ -3811,7 +3811,7 @@ msgstr ""
 "corriger les processus de mise à jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 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 "
@@ -3833,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:257
+#: apt.conf.5.xml:251
 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 "
@@ -3873,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:273
+#: apt.conf.5.xml:267
 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:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3890,7 +3890,7 @@ msgstr ""
 "question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3900,7 +3900,7 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3910,12 +3910,12 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "Le groupe Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3926,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:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3947,7 +3947,7 @@ msgstr ""
 "alors utilisée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3966,7 +3966,7 @@ msgstr ""
 "l'option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3986,7 +3986,7 @@ msgstr ""
 "nom de l'option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3997,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:341
+#: apt.conf.5.xml:335
 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 "
@@ -4016,7 +4016,7 @@ msgstr ""
 "fichiers de différences."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4032,7 +4032,7 @@ msgstr ""
 "initiée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4042,7 +4042,7 @@ msgstr ""
 "échoué."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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."
@@ -4052,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:369
+#: apt.conf.5.xml:363
 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]/</"
@@ -4073,7 +4073,7 @@ msgstr ""
 "options de mandataire HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 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 "
@@ -4093,7 +4093,7 @@ msgstr ""
 "fichiers .deb très grands."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 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."
@@ -4103,7 +4103,7 @@ msgstr ""
 "connexion qu'aux données."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 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."
@@ -4123,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:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4132,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:400
+#: apt.conf.5.xml:394
 #, fuzzy
 #| msgid ""
 #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
@@ -4154,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:407
+#: apt.conf.5.xml:401
 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 "
@@ -4166,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:411
+#: apt.conf.5.xml:405
 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 "
@@ -4180,7 +4180,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4197,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:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4230,7 +4230,7 @@ msgstr ""
 "<literal>TLSv1</literal> ou <literal>SSLv3</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 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]/</"
@@ -4266,7 +4266,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4283,7 +4283,7 @@ msgstr ""
 "modèle de fichier de configuration)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 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 "
@@ -4298,7 +4298,7 @@ msgstr ""
 "efficacité de cette méthode."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4314,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:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4343,7 +4343,7 @@ msgstr ""
 "<literal>UMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4352,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:523
+#: apt.conf.5.xml:517
 #, 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:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4378,19 +4378,19 @@ msgstr ""
 "type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, 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:531
+#: apt.conf.5.xml:525
 #, 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:524
+#: apt.conf.5.xml:518
 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 "
@@ -4422,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:538
+#: apt.conf.5.xml:532
 #, 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:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4455,7 +4455,7 @@ msgstr ""
 "question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4467,7 +4467,7 @@ msgstr ""
 "surtout destiné aux miroirs locaux."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4482,7 +4482,7 @@ msgstr ""
 "(« False »)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4502,13 +4502,13 @@ msgstr ""
 "langues étant particulièrement rares."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, 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:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4548,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:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4562,22 +4562,22 @@ msgstr ""
 "(après un « <literal>none</literal> » implicite)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 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:591
+#: apt.conf.5.xml:585
 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:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "Les répertoires"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4597,16 +4597,28 @@ msgstr ""
 "<filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contient les emplacements qui renseignent sur "
 "le cache local : par exemple, les deux caches de paquets "
@@ -4620,7 +4632,7 @@ msgstr ""
 "Cache</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4635,7 +4647,7 @@ msgstr ""
 "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4646,7 +4658,7 @@ msgstr ""
 "configuration est chargé."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4664,7 +4676,7 @@ msgstr ""
 "programmes correspondants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4686,7 +4698,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4704,12 +4716,12 @@ msgstr ""
 "est possible d'utiliser la syntaxe des expressions rationnelles."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "APT et DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4720,7 +4732,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4743,7 +4755,7 @@ msgstr ""
 "avant de récupérer de nouveaux paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4752,7 +4764,7 @@ msgstr ""
 "&apt-get; lors de la phase d'installation."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: 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 update phase."
@@ -4761,7 +4773,7 @@ msgstr ""
 "&apt-get; lors de la phase de mise à jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4771,12 +4783,12 @@ msgstr ""
 "d'erreur que l'on propose à l'utilisateur d'intervenir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "Méthode d'appel de &dpkg; par APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4785,7 +4797,7 @@ msgstr ""
 "&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4796,7 +4808,7 @@ msgstr ""
 "est passé comme un seul paramètre à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4809,7 +4821,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:712
+#: apt.conf.5.xml:707
 #, fuzzy
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4833,7 +4845,7 @@ msgstr ""
 "qu'il va installer, à raison d'un par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 #, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
@@ -4855,7 +4867,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4866,7 +4878,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4877,7 +4889,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4886,7 +4898,7 @@ msgstr ""
 "le répertoire <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4896,14 +4908,14 @@ msgstr ""
 "créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 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:752
+#: apt.conf.5.xml:747
 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 "
@@ -4930,7 +4942,7 @@ msgstr ""
 "pendant la configuration des paquets."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4944,7 +4956,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4968,7 +4980,7 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4991,7 +5003,7 @@ msgstr ""
 "options « unpack » et « remove »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5021,7 +5033,7 @@ msgstr ""
 "configuré et donc éventuellement non amorçable."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5040,7 +5052,7 @@ msgstr ""
 "peut conserver l'option active."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5058,7 +5070,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:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5076,7 +5088,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 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 "
@@ -5102,12 +5114,12 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Options « Periodic » et « Archive »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5119,12 +5131,12 @@ msgstr ""
 "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "Les options de débogage"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5142,7 +5154,7 @@ msgstr ""
 "peuvent tout de même être utiles :"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5153,7 +5165,7 @@ msgstr ""
 "upgrade, upgrade, install, remove et purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5165,7 +5177,7 @@ msgstr ""
 "superutilisateur."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5177,7 +5189,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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5186,12 +5198,12 @@ msgstr ""
 "type statfs dans les identifiants de CD."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 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:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5199,24 +5211,24 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 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:918
+#: apt.conf.5.xml:913
 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:929
+#: apt.conf.5.xml:924
 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:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5225,7 +5237,7 @@ msgstr ""
 "cryptographiques avec <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5234,14 +5246,14 @@ msgstr ""
 "stockées sur CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 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:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5250,7 +5262,7 @@ msgstr ""
 "librairies d'<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5261,7 +5273,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:992
+#: apt.conf.5.xml:987
 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."
@@ -5271,14 +5283,14 @@ msgstr ""
 "temps."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 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:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5288,7 +5300,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5298,7 +5310,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5308,7 +5320,7 @@ msgstr ""
 "place des fichiers complets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5316,7 +5328,7 @@ msgstr ""
 "effectivement des téléchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5325,7 +5337,7 @@ msgstr ""
 "automatiquement, et la suppression des paquets inutiles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5340,7 +5352,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:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5376,7 +5388,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:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5385,7 +5397,7 @@ msgstr ""
 "paramètres sont séparés par des espaces."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5395,7 +5407,7 @@ msgstr ""
 "fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5404,18 +5416,18 @@ msgstr ""
 "<literal>apt</literal> passe les paquets à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 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:1148
+#: apt.conf.5.xml:1143
 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:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5424,7 +5436,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:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5435,7 +5447,7 @@ msgstr ""
 "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5444,7 +5456,7 @@ msgstr ""
 "list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 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 "
@@ -5452,13 +5464,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5468,17 +5480,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "Fichier de contrôle des préférences pour APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5491,7 +5503,7 @@ msgstr ""
 "l'on veut installer."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5513,7 +5525,7 @@ msgstr ""
 "veut installer."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -5529,7 +5541,7 @@ msgstr ""
 "le choix des exemplaires, seulement sur le choix de la version."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -5550,7 +5562,7 @@ msgstr ""
 "mélangées sans une bonne compréhension des paragraphes qui suivent."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5572,24 +5584,24 @@ msgstr ""
 "étant, eux, ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "Priorités affectées par défaut"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -5614,7 +5626,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
@@ -5623,12 +5635,12 @@ msgstr ""
 "suivant pour déterminer la priorité des versions d'un paquet :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "priorité 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5641,12 +5653,12 @@ msgstr ""
 "<literal>experimental</literal> de Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "une priorité égale à 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5659,12 +5671,12 @@ msgstr ""
 "depuis <literal>squeeze-backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "une priorité égale à 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -5673,12 +5685,12 @@ msgstr ""
 "pas à la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "une priorité égale à 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -5686,7 +5698,7 @@ msgstr ""
 "la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -5704,7 +5716,7 @@ msgstr ""
 "« ButAutomaticUpgrades: yes »."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5713,7 +5725,7 @@ msgstr ""
 "qu'il faut installer (par ordre de priorité) :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5729,12 +5741,12 @@ msgstr ""
 "arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "Installer la version qui possède la priorité la plus haute."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5743,7 +5755,7 @@ msgstr ""
 "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5755,7 +5767,7 @@ msgstr ""
 "qui n'est pas installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5770,7 +5782,7 @@ msgstr ""
 "replaceable></command> ou <command>apt-get dist-upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5783,7 +5795,7 @@ msgstr ""
 "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5802,12 +5814,12 @@ msgstr ""
 "priorité que celle de la version installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "Conséquences des préférences"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5820,7 +5832,7 @@ msgstr ""
 "formes, une forme particulière et une forme générale."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5836,7 +5848,7 @@ msgstr ""
 "dont le numéro de version commence par <literal>&good-perl;</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5848,7 +5860,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -5863,7 +5875,7 @@ msgstr ""
 "un nom complètement qualifié."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -5874,7 +5886,7 @@ msgstr ""
 "priorité haute à toutes les versions disponibles dans le site local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5886,7 +5898,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -5899,7 +5911,7 @@ msgstr ""
 "serveur identifié par l' nom d'hôte « ftp.de.debian.org »."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5911,7 +5923,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5926,7 +5938,7 @@ msgstr ""
 "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5937,7 +5949,7 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5949,7 +5961,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5960,7 +5972,7 @@ msgstr ""
 "<literal>&testing-codename;</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5972,7 +5984,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5984,7 +5996,7 @@ msgstr ""
 "<literal>&stable-version;</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5996,12 +6008,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Expressions régulières et syntaxe &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -6017,7 +6029,7 @@ msgstr ""
 "POSIX étendue, entourée de barres obliques)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -6029,7 +6041,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6041,7 +6053,7 @@ msgstr ""
 "par &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6053,7 +6065,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6072,12 +6084,12 @@ msgstr ""
 "expression &glob; en soi."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Méthode d'interprétation des priorités par APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6086,12 +6098,12 @@ msgstr ""
 "entiers positifs ou négatifs. Ils sont interprétés à peu près comme suit :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6100,12 +6112,12 @@ msgstr ""
 "retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6115,12 +6127,12 @@ msgstr ""
 "plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -6129,12 +6141,12 @@ msgstr ""
 "distribution par défaut ou si la version installée est plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -6143,29 +6155,29 @@ msgstr ""
 "autre distribution ou si la version installée est plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr "la version sera installée si aucune version du paquet n'est installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "cette priorité empêche l'installation de la version."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6179,7 +6191,7 @@ msgstr ""
 "trouvée détermine la priorité."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6188,7 +6200,7 @@ msgstr ""
 "entrées décrites ci-dessous :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6216,12 +6228,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Alors :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -6236,7 +6248,7 @@ msgstr ""
 "arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6247,7 +6259,7 @@ msgstr ""
 "appartenant à la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6260,13 +6272,13 @@ msgstr ""
 "paquet n'est déjà installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 "Détermination de la version des paquets et des propriétés des distributions"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6277,7 +6289,7 @@ msgstr ""
 "décrivent les paquets disponibles à cet endroit."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6296,27 +6308,27 @@ msgstr ""
 "sont pertinentes pour la détermination des priorités :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "la ligne <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "donne le nom du paquet"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "la ligne <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "donne le numéro de version du paquet"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6338,12 +6350,12 @@ msgstr ""
 "pertinentes pour déterminer les priorités :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6360,18 +6372,18 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "la ligne <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6389,13 +6401,13 @@ msgstr ""
 "ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6412,7 +6424,7 @@ msgstr ""
 "préférences demanderait ces lignes :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6424,12 +6436,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "La ligne <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6447,18 +6459,18 @@ msgstr ""
 "fichier des préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "La ligne <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6471,18 +6483,18 @@ msgstr ""
 "ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "La ligne <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6495,13 +6507,13 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6526,12 +6538,12 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Lignes facultatives dans le fichier des préférences"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6542,12 +6554,12 @@ msgstr ""
 "commentaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Méthode pour suivre Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6571,7 +6583,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6586,8 +6598,8 @@ msgstr ""
 "literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6599,7 +6611,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6612,13 +6624,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6631,12 +6643,12 @@ msgstr ""
 "de relancer la commande.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Méthode pour suivre Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6664,7 +6676,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6681,7 +6693,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6694,13 +6706,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6719,12 +6731,12 @@ msgstr ""
 "installée.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Suivre l'évolution d'une version par son nom de code"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6758,7 +6770,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6782,7 +6794,7 @@ msgstr ""
 "exemples précédents.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6795,13 +6807,13 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6820,17 +6832,17 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "Liste des sources de données APT configurées"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6847,7 +6859,7 @@ msgstr ""
 "commande équivalent avec une autre interface à APT)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6862,12 +6874,12 @@ msgstr ""
 "reste de la ligne est un commentaire."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -6891,12 +6903,12 @@ msgstr ""
 "ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "Les types deb et deb-src."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6922,7 +6934,7 @@ msgstr ""
 "pour récupérer les index des sources."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6931,14 +6943,14 @@ msgstr ""
 "types <literal>deb</literal> et <literal>deb-src</literal> est :"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, fuzzy, no-wrap
 #| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ options ] uri distribution [composant1] [composant2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6961,14 +6973,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 #, fuzzy
 #| msgid ""
 #| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -7000,7 +7012,7 @@ msgstr ""
 "être présent."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 #, fuzzy
 #| msgid ""
 #| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -7028,7 +7040,7 @@ msgstr ""
 "literal> crée automatiquement un URI en fonction de l'architecture effective."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 #, fuzzy
 #| msgid ""
 #| "Since only one distribution can be specified per line it may be necessary "
@@ -7068,7 +7080,7 @@ msgstr ""
 "tirer plus efficacement parti des sites à faible bande passante."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -7085,7 +7097,7 @@ msgstr ""
 "ignorés silencieusement) :"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7100,7 +7112,7 @@ msgstr ""
 "Architectures</literal> sera téléchargée."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 #, fuzzy
 #| msgid ""
 #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -7121,7 +7133,7 @@ msgstr ""
 "Architectures</literal> sera téléchargée."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -7139,7 +7151,7 @@ msgstr ""
 "authentifiées comme non authentifiées."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -7152,12 +7164,12 @@ msgstr ""
 "les hôtes distants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Exemples :"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7169,17 +7181,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "Spécification des URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "Les types d'URI actuellement reconnues sont :"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7190,7 +7202,7 @@ msgstr ""
 "avec les montages NFS, les miroirs et les archives locaux."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7200,7 +7212,7 @@ msgstr ""
 "pour créer des entrées dans la liste des sources."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7217,7 +7229,7 @@ msgstr ""
 "Notez qu'il s'agit d'une méthode d'authentification peu sûre."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7239,7 +7251,7 @@ msgstr ""
 "configuration seront ignorés."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -7253,7 +7265,7 @@ msgstr ""
 "des fichiers avec APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7267,12 +7279,12 @@ msgstr ""
 "sont utilisées pour l'accès aux fichiers de la machine distante."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "ajout de types d'URI supplémentaires reconnues"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7291,7 +7303,7 @@ msgstr ""
 "disponibles (voir &apt-transport-debtorrent;)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7300,37 +7312,37 @@ msgstr ""
 "debian pour stable/main, stable/contrib et stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Comme ci-dessus, excepté que cette ligne utilise la distribution "
 "« unstable » (développement)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "La précédente ligne, mais pour les sources."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7341,7 +7353,7 @@ msgstr ""
 "<literal>amd64</literal> et <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7351,7 +7363,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7360,13 +7372,13 @@ msgstr ""
 "n'utiliser que la section hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7375,13 +7387,13 @@ msgstr ""
 "répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7394,19 +7406,19 @@ msgstr ""
 "apparaissent, une seule session FTP sera utilisée pour les deux lignes."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7426,17 +7438,17 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7445,7 +7457,7 @@ msgstr ""
 "<command>debconf</command> contenu dans un paquet Debian"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7460,12 +7472,12 @@ msgstr ""
 "suivant :"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "paquet version guide-de-configuration script-de-configuration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7480,7 +7492,7 @@ msgstr ""
 "<filename>package.config.XXXXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7491,7 +7503,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7500,12 +7512,12 @@ msgstr ""
 "le nombre 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "Outil de tri des index de paquets."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -7518,7 +7530,7 @@ msgstr ""
 "internes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7526,7 +7538,7 @@ msgstr ""
 "fichier analysable."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7535,7 +7547,7 @@ msgstr ""
 "configuration : <literal>APT::SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7544,12 +7556,12 @@ msgstr ""
 "en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "Outil de création de fichiers d'index"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -7561,7 +7573,7 @@ msgstr ""
 "index doit être créé pour un site et basé sur le contenu de ce site."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7576,7 +7588,7 @@ msgstr ""
 "élaborée pour automatiser le processus de création d'une archive complète."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -7591,7 +7603,7 @@ msgstr ""
 "voulus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7605,7 +7617,7 @@ msgstr ""
 "équivalente à &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7613,7 +7625,7 @@ msgstr ""
 "binaire."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7627,7 +7639,7 @@ msgstr ""
 "équivalente à &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -7638,7 +7650,7 @@ msgstr ""
 "override pour changer de fichier source d'« override »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7656,7 +7668,7 @@ msgstr ""
 "virgule sépare les paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7682,7 +7694,7 @@ msgstr ""
 "sommes de contrôle MD5, SHA1 et SHA256 pour chaque fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7703,7 +7715,7 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -7717,7 +7729,7 @@ msgstr ""
 "préciser index et répertoires aussi bien que les paramètres requis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7727,12 +7739,12 @@ msgstr ""
 "sont plus nécessaires."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "Configuration de la commande generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7749,19 +7761,19 @@ msgstr ""
 "arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
 "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "La section <literal>Dir</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7774,7 +7786,7 @@ msgstr ""
 "manière à produire un chemin absolu et complet."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -7785,17 +7797,17 @@ msgstr ""
 "filename> et les noeuds des distributions."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "Indique l'emplacement des fichiers d'« override »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "Indique l'emplacement des fichiers de cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7804,12 +7816,12 @@ msgstr ""
 "sert de la valeur <literal>FileList</literal> définie plus bas)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "La section <literal>Default</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7820,7 +7832,7 @@ msgstr ""
 "annulées dans d'autres sections (paramètrage par section)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -7833,7 +7845,7 @@ msgstr ""
 "Par défaut, c'est la chaîne « . gzip »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7842,7 +7854,7 @@ msgstr ""
 "paquets. Par défaut, c'est « .deb »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7851,7 +7863,7 @@ msgstr ""
 "compressés les fichiers sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7860,7 +7872,7 @@ msgstr ""
 "fichiers sources. Par défaut, c'est « .dsc »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7869,7 +7881,7 @@ msgstr ""
 "compressés les fichiers « Contents »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7878,7 +7890,7 @@ msgstr ""
 "compressé le fichier maître Translations-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7889,7 +7901,7 @@ msgstr ""
 "paramètre <literal>External-Links</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -7899,7 +7911,7 @@ msgstr ""
 "utilisateur (umasq) est ignoré."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7910,12 +7922,12 @@ msgstr ""
 "<filename>Translation-en</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "La section <literal>TreeDefault</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7927,7 +7939,7 @@ msgstr ""
 "respective."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -7938,7 +7950,7 @@ msgstr ""
 "robin » de manière que, sur plusieurs jours, tous soient reconstruits."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -7956,7 +7968,7 @@ msgstr ""
 "défaut ce nombre vaut 10, l'unité étant le jour."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7965,7 +7977,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7974,7 +7986,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/source/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7983,7 +7995,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7992,7 +8004,7 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -8003,7 +8015,7 @@ msgstr ""
 "défaut : <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -8014,7 +8026,7 @@ msgstr ""
 "défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -8028,12 +8040,12 @@ msgstr ""
 "<command>apt-ftparchive</command> les intègre automatiquement."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8042,7 +8054,7 @@ msgstr ""
 "Différentes sections peuvent partager cette base de données."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8053,7 +8065,7 @@ msgstr ""
 "relatifs sont préfixés par le répertoire de l'archive."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8066,12 +8078,12 @@ msgstr ""
 "traiter les index de sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "La section <literal>Tree</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8085,7 +8097,7 @@ msgstr ""
 "par la variable de substitution <literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -8098,7 +8110,7 @@ msgstr ""
 "C'est par exemple : <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8109,7 +8121,7 @@ msgstr ""
 "trois nouvelles variables suivantes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8123,7 +8135,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8134,7 +8146,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8145,7 +8157,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -8156,7 +8168,7 @@ msgstr ""
 "que l'arborescence est une arborescence de sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8165,7 +8177,7 @@ msgstr ""
 "informations sur la section, la priorité et le responsable du paquet."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8174,22 +8186,22 @@ msgstr ""
 "informations sur la section."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "Indique un autre fichier d'« override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "Indique un autre fichier d'« override » pour les sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "La section <literal>BinDirectory</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8204,12 +8216,12 @@ msgstr ""
 "paramètrage de <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "Définit le fichier « Packages » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8218,42 +8230,42 @@ msgstr ""
 "<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "Définit le fichier « Contents » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "Définit le fichier d'« override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "Définit le fichier d'« override » pour les sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "Définit la base de données cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "Ajoute un chemin à tous les chemins créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "Définit le fichier contenant la liste des fichiers."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "Le fichier d'« Override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8268,19 +8280,19 @@ msgstr ""
 "nom du responsable de paquet."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8297,12 +8309,12 @@ msgstr ""
 "deuxième forme remplace inconditionnellement le champ."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "Le fichier d'« Override » pour les sources"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8313,12 +8325,12 @@ msgstr ""
 "sa section."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "Le fichier supplémentaire d'« Override »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8330,7 +8342,7 @@ msgstr ""
 "ligne est la nouvelle valeur."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8354,7 +8366,7 @@ msgstr ""
 "<literal>MD5</literal>, <literal>SHA1</literal> ou <literal>SHA256</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8364,7 +8376,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -8380,7 +8392,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -8394,7 +8406,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -8410,7 +8422,7 @@ msgstr ""
 "de configuration : <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8421,7 +8433,7 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8430,7 +8442,7 @@ msgstr ""
 "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8444,7 +8456,7 @@ msgstr ""
 "<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8467,7 +8479,7 @@ msgstr ""
 "survenir et l'ensemble de ces contrôles devient inutile."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8483,13 +8495,13 @@ msgstr ""
 "generate."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8498,7 +8510,7 @@ msgstr ""
 "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8506,36 +8518,53 @@ msgstr ""
 "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
 "nombre 100 en cas d'erreur."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "fr"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "Guide d'utilisation d'APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
 "paquets APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8547,8 +8576,8 @@ msgstr ""
 "telle que publiée par la Free Software Foundation, en version 2 ou "
 "ultérieure."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8556,31 +8585,32 @@ msgstr ""
 "Les détails complets de cette licence sont, sur les systèmes Debian GNU/"
 "Linux, consultables dans le fichier usr/share/common-licenses/GPL."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "Généralités"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
 "Le paquet APT comporte actuellement deux parties : la méthode APT pour "
-"<prgn>dselect</prgn> et l'interface en ligne de commande <prgn>apt-get</"
-"prgn>. Les deux fournissent des méthodes d'installation et de suppression de "
-"paquets ainsi que de téléchargement de nouveaux paquets par Internet."
+"<command>dselect</command> et l'interface en ligne de commande <command>apt-"
+"get</command>. Les deux fournissent des méthodes d'installation et de "
+"suppression de paquets ainsi que de téléchargement de nouveaux paquets par "
+"Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Anatomie du système de gestion des paquets"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8591,8 +8621,8 @@ msgstr ""
 "proprement et facilement sur le système. Une des fonctionnalités les plus "
 "immédiatement visibles est le système de gestion des dépendances."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8608,8 +8638,8 @@ msgstr ""
 "d'effectuer des choix parmi les divers agents de transport de courrier "
 "électronique, les serveurs X et d'autres cxomposants du système."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8621,8 +8651,8 @@ msgstr ""
 "est le cas où un paquet donné a besoin qu'un autre paquet soit installé "
 "simultanément pour pouvoir fonctionner correctement."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8635,8 +8665,8 @@ msgstr ""
 "plus, étant une extension à Emacs sans lequel il est totalement inutile, il "
 "a une dépendance simple sur emacs."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8659,8 +8689,8 @@ msgstr ""
 "courrier électronique soient établis comme étant en conflit les uns avec les "
 "autres."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8682,8 +8712,8 @@ msgstr ""
 "paquet « mail-transprot-agent ». Cette fonctionnalité utile peut toutefois "
 "rendre la correction de certains défauts des paquets plus complexe."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8695,81 +8725,87 @@ msgstr ""
 "problèmes de dépendances par l'intermédiaire d'un certain nombre "
 "d'algorithmes automatiques qui simplifient le choix des paquets à installer."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"Le programme <prgn>apt-get</prgn> offre une méthode simple pour installer "
-"des paquets à la ligne de commande. À la différence de <prgn>dpkg</prgn>, "
-"<prgn>apt-get</prgn> ne gère pas directement les fichiers .deb files. Il "
-"travaille avec le nom des paquets et ne peut installer les archives .deb que "
-"depuis une <em>Source</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"La première action <footnote><p>Si vous utilisez un serveur mandataire "
-"(« proxy ») HTTP, vous devez d'abord positionner la variable d'environnement "
-"http_proxy, voir sources.list(5)</p></footnote> à effectuer avant d'utiliser "
-"<prgn>apt-get</prgn> est de récupérer les listes de paquets depuis les "
-"<em>Sources</em> afin que le programme sache quels sont les paquets "
-"disponibles. Cela peut être effectué avec la commande <tt>apt-get update</"
-"tt>. Par exemple,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"Le programme <command>apt-get</command> offre une méthode simple pour "
+"installer des paquets à la ligne de commande. À la différence de "
+"<command>dpkg</command>, <command>apt-get</command> ne gère pas directement "
+"les fichiers .deb files. Il travaille avec le nom des paquets et ne peut "
+"installer les archives .deb que depuis une <emphasis>Source</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Si vous utilisez un serveur mandataire (« proxy ») HTTP, vous devez d'abord "
+"positionner la variable d'environnement http_proxy, voir sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"La première action <placeholder type=\"footnote\" id=\"0\"/> à effectuer "
+"avant d'utiliser <command>apt-get</command> est de récupérer les listes de "
+"paquets depuis les <emphasis>Sources</emphasis> afin que le programme sache "
+"quels sont les paquets disponibles. Cela peut être effectué avec la commande "
+"<literal>apt-get update</literal>. Par exemple,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Lecture des listes de paquets... Fait\n"
-"Construction de l'arbre des dépendances... Fait"
+"Construction de l'arbre des dépendances... Fait\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 "Une fois cette mise à jour effectuée, plusieurs commandes peuvent être "
 "utilisées :"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "La commande « upgrade » permet de mettre à jour le système de manière non "
 "invasive. Cette commande ne provoquera jamais l'installation de nouveaux "
@@ -8779,17 +8815,17 @@ msgstr ""
 "pour mettre à jour le système de manière relativement sûre. Lorsqu'elle est "
 "utilisée, la liste des paquets qui ne peuvent être mis à jour sera affichée. "
 "Cela est en général du au fait qu'ils dépendent de nouveaux paquets ou "
-"qu'ils entrent en conflit avec d'autres paquets. Le programme <prgn>dselect</"
-"prgn> ou la commande <tt>apt-get install</tt> peuvet être utilisés pour "
-"forcer l'installation de tels paquets."
+"qu'ils entrent en conflit avec d'autres paquets. Le programme "
+"<command>dselect</command> ou la commande <literal>apt-get install</literal> "
+"peuvet être utilisés pour forcer l'installation de tels paquets."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8809,21 +8845,22 @@ msgstr ""
 "demander une confirmation si des actions autres que ce qui est demandé à la "
 "ligne de commande sont nécessaires."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "La commande « dist-upgrade » est une commande de mise à jour complète "
 "d'abord destinés à permettre les mises à jour entre deux versions "
@@ -8831,12 +8868,13 @@ msgstr ""
 "de paquets à installer, mettre à jour ou supprimer est déterminé dans le but "
 "d'amener une majorité du système vers la nouvelle version. Dans certains "
 "cas, il peut être judicieux d'utiliser « dist-upgrade » plutôt que de "
-"chercher à résoudre manuellement les dépendances avec <prgn>dselect</prgn>. "
-"Une fois que « dist-upgrade » a été utilisé, <prgn>dselect</prgn> peut "
-"servir à installer les paquets qui auraient pu être laissés de côté."
+"chercher à résoudre manuellement les dépendances avec <command>dselect</"
+"command>. Une fois que « dist-upgrade » a été utilisé, <command>dselect</"
+"command> peut servir à installer les paquets qui auraient pu être laissés de "
+"côté."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8844,174 +8882,179 @@ msgstr ""
 "Il est important de regarder de près ce que « dist-upgrade » car ses "
 "décisions peuvent parfois apparaître surprenantes."
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
 #, 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 "
-#| "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 "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed 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 used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> fournit de nombreuses options de ligne de commande qui "
-"sont expliquées en détail dans sa page de manuel, <manref section=\"8\" name="
-"\"apt-get\">. Une des plus utiles est l'option <tt>-d</tt> qui récupère sans "
-"les installer les fichiers nécessaires. Si le système a besoin de "
-"télécharger un grand nombre de paquets, il est par exemple souhaitable de "
-"pouvoir simplement les récupérer sans les installer immédiatement, au cas où "
-"quelque chose se passe mal. Une fois que <tt>-d</tt> a été utilisé, il est "
-"possible d'installer les archives téléchargées en exécutant simplement la "
-"commande qui a permis de les récupérer, sans l'option <tt>-d</tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#| "<command>apt-get</command> has several command line options that are "
+#| "detailed in its man page, <manref section=\"8\" name=\"apt-get\">. The "
+#| "most useful option is <literal>-d</literal> 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 <literal>-d</literal> is used the downloaded archives can be "
+#| "installed by simply running the command that caused them to be downloaded "
+#| "again without <literal>-d</literal>."
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> 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 <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> fournit de nombreuses options de ligne de "
+"commande qui sont expliquées en détail dans sa page de manuel, <manref "
+"section=\"8\" name=\"apt-get\">. Une des plus utiles est l'option <literal>-"
+"d</literal> qui récupère sans les installer les fichiers nécessaires. Si le "
+"système a besoin de télécharger un grand nombre de paquets, il est par "
+"exemple souhaitable de pouvoir simplement les récupérer sans les installer "
+"immédiatement, au cas où quelque chose se passe mal. Une fois que <literal>-"
+"d</literal> a été utilisé, il est possible d'installer les archives "
+"téléchargées en exécutant simplement la commande qui a permis de les "
+"récupérer, sans l'option <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"La méthode APT de <prgn>dselect</prgn> permet d'utiliser le système APT dans "
-"son ensemble depuis l'interface graphique de gestion des paquets "
-"<prgn>dselect</prgn>. L'interface est alors utilisée pour choisir les "
+"La méthode APT de <command>dselect</command> permet d'utiliser le système "
+"APT dans son ensemble depuis l'interface graphique de gestion des paquets "
+"<command>dselect</command>. L'interface est alors utilisée pour choisir les "
 "paquets à installer ou supprimer et c'est APT qui effectue les opérations "
 "individuelles d'installation ou suppression."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Pour activer la méthode APT, il est nécessaire de choisir [A]ccéder dans "
-"<prgn>dselect</prgn> puis utiliser le choix permettant d'activer APT. Des "
-"<em>Sources</em> d'installation seront demandées, qui sont les emplacements "
-"d'où les paquets seront récupérés. Cela peut être des sites Internet "
-"distants, des miroirs locaux ou des CD. Chaque source peut fournir un sous-"
-"ensemble de l'archive complète Debian. APT les combinera automatiquement "
-"pour créer un jeu complet de paquets. Avec des supports de type CD, il est "
-"conseillé de les indiquer en premier puis de les compléter avec un miroir "
-"distant qui permettra d'obtenir les versions les plus à jour s'il y en a. "
-"APT utilisera alors les paquets disponibles sur les CD avant de les "
-"télécharger via l'Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command> puis utiliser le choix permettant d'activer APT. "
+"Des <emphasis>Sources</emphasis> d'installation seront demandées, qui sont "
+"les emplacements d'où les paquets seront récupérés. Cela peut être des sites "
+"Internet distants, des miroirs locaux ou des CD. Chaque source peut fournir "
+"un sous-ensemble de l'archive complète Debian. APT les combinera "
+"automatiquement pour créer un jeu complet de paquets. Avec des supports de "
+"type CD, il est conseillé de les indiquer en premier puis de les compléter "
+"avec un miroir distant qui permettra d'obtenir les versions les plus à jour "
+"s'il y en a. APT utilisera alors les paquets disponibles sur les CD avant de "
+"les télécharger via l'Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "  Réglage de a liste des emplacements sources de distribution\n"
-"\t \n"
+"\n"
 " Veuillez indiquer l'URL de base de la  distribution Debian.\n"
 " Les schémas d'accès connus sont : http file\n"
-"\t   \n"
+"\n"
 " Exemple:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"La configuration des <em>Sources</em> débute par l'indication de la base de "
-"l'archive Debian, par défaut un miroir HTTP. Puis la distribution est "
-"demandée."
+"La configuration des <emphasis>Sources</emphasis> débute par l'indication de "
+"la base de l'archive Debian, par défaut un miroir HTTP. Puis la distribution "
+"est demandée."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Veuillez indiquer le nom de la distribution à utiliser ou\n"
 " le chemin d'accès au fichier des paquets, terminé par un /.\n"
 " Les noms de distribution sont en général de la forme suivante :\n"
 " stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable] :"
+"\n"
+" Distribution [stable] :\n"
 
-#. type: <p></p>
-#: guide.sgml:222
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
 msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
 msgstr ""
 "La distribution fait référence à la version de Debian dans l'archive. "
-"<em>stable</em> est la dernière version publiée et <em>unstable</em> la "
-"version en développement. <em>non-US</em> n'est disponible que sur certains "
-"miroirs et fait référence à des paquets contenant des technologies de "
-"chiffrement et d'autres élements dont l'exportation est interdite depuis les "
-"États-Unis d'Amérique. Il est toutefois autorisé de les y importer. [Note du "
-"traducteur : à la date de cette traduction, 2010, cette notion est "
-"totalement obsolète]."
-
-#. type: <example></example>
-#: guide.sgml:228
+"<emphasis>stable</emphasis> est la dernière version publiée et "
+"<emphasis>unstable</emphasis> la version en développement. <emphasis>non-US</"
+"emphasis> n'est disponible que sur certains miroirs et fait référence à des "
+"paquets contenant des technologies de chiffrement et d'autres élements dont "
+"l'exportation est interdite depuis les États-Unis d'Amérique. Il est "
+"toutefois autorisé de les y importer. [Note du traducteur : à la date de "
+"cette traduction, 2010, cette notion est totalement obsolète]."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Veuillez indiquer les composants à utiliser\n"
 " Les composants sont en général de la forme suivante :\n"
 " main contrib non-free\n"
-"  \n"
-" Composants [main contrib non-free] :"
+"\n"
+" Composants [main contrib non-free] :\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -9025,8 +9068,8 @@ msgstr ""
 "Debian (DFSG) alors que contrib et non-free correspondent à des éléments qui "
 "comprennent des restrictions de distribution ou d'utilisation."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -9035,24 +9078,24 @@ msgstr ""
 "configuration continuera à les demander tant que vous n'indiquerez pas que "
 "le processus est terminé."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Avant d'utiliser <prgn>dselect</prgn>, il est nécessaire de mettre à jour la "
-"liste de ce qui est disponible en choisissant « [M]ise à jour » depuis le "
-"menu. Cette action exécutera la commande « apt-get update », ce qui rendra "
-"les informations récupérées disponibles pour <prgn>dselect</prgn>. Elle doit "
-"être utilisée même si la commande « apt-get » a déjà été utilisée sur ce "
-"système."
+"Avant d'utiliser <command>dselect</command>, il est nécessaire de mettre à "
+"jour la liste de ce qui est disponible en choisissant « [M]ise à jour » "
+"depuis le menu. Cette action exécutera la commande « apt-get update », ce "
+"qui rendra les informations récupérées disponibles pour <command>dselect</"
+"command>. Elle doit être utilisée même si la commande « apt-get » a déjà été "
+"utilisée sur ce système."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9065,77 +9108,84 @@ msgstr ""
 "« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » "
 "fait l'ensemble des opérations."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Par défait, APT supprimera automatiquement les fichiers des paquets "
 "(fichiers .deb) une fois qu'ils ont été installés correctement. Pour "
-"modifier ce comportement, vous pouvez utiliser <tt>Dselect::clean \"prompt\";"
-"</tt> dans /etc/apt/apt.conf."
+"modifier ce comportement, vous pouvez utiliser <literal>Dselect::clean "
+"\"prompt\";</literal> dans /etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "L'interface"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"La méthode <command>dselect</command> consiste en fait en un jeu de scripts "
+"qui encapsulent <command>apt-get</command>. Cela approte des fonctionnalités "
+"supplémentaires à celles d'<command>apt-get</command> utilisé isolément."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"La méthode APT de <prgn>dselect</prgn> et le programme <prgn>apt-get</prgn> "
-"utilisent la même interface. Elle consiste en un système simple qui indique "
-"les opérations qui seront effectuées puis les réalise.<footnote><p>La "
-"méthode <prgn>dselect</prgn> consiste en fait en un jeu de scripts qui "
-"encapsulent <prgn>apt-get</prgn>. Cela approte des fonctionnalités "
-"supplémentaires à celles d'<prgn>apt-get</prgn> utilisé isolément.</p></"
-"footnote> Après avoir indiqué un résumé des opérations qui seront "
-"effectuées, APT donnera un certain nombre d'informations permettant "
-"d'estimer sa progression, tout au long des actions qu'il effectue. "
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"La méthode APT de <command>dselect</command> et le programme <command>apt-"
+"get</command> utilisent la même interface. Elle consiste en un système "
+"simple qui indique les opérations qui seront effectuées puis les réalise."
+"<placeholder type=\"footnote\" id=\"0\"/> Après avoir indiqué un résumé des "
+"opérations qui seront effectuées, APT donnera un certain nombre "
+"d'informations permettant d'estimer sa progression, tout au long des actions "
+"qu'il effectue. "
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Démarrage"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Avant toute opération autre qu'une mise à jour, APT effectue un certain "
 "nombre d'actions pour préparer ses mécaismes internes de fonctionnement. Il "
 "vérifie également l'état du système. Ces opérations peuvent être effectuées "
-"isolément avec la commande  <tt>apt-get check</tt>."
+"isolément avec la commande  <literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Lecture de la liste des paquets... Fait\n"
-"Construction de l'arbre des dépendances... Fait"
+"Construction de l'arbre des dépendances... Fait\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9148,21 +9198,21 @@ msgstr ""
 "pas trouvés, ils seront ignorés et une informatique sera affichée quand apt-"
 "get se terminera."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "Ensuite, une analyse détaillée des dépendances du système est réalisée. Les "
 "dépendances de chaque paquet installé ou décompressé sont vérifiées. Si un "
-"problème est trouvé, il sera affiché et <prgn>apt-get</prgn> bloquera des "
-"opérations ultérieures."
+"problème est trouvé, il sera affiché et <command>apt-get</command> bloquera "
+"des opérations ultérieures."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9172,33 +9222,33 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Lecture de la liste des paquets... Fait\n"
-"Construction de l'arbre des dépendances.. Fait\n"
+"Construction de l'arbre des dépendances... Fait\n"
 "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes.\n"
 "Les paquets suivants contiennent des dépendances non satisfaites :\n"
 "  9fonts: Depends: xlib6g mais il n'est pas installé\n"
 "  uucp: Depends: mailx mais il n'est pas installé\n"
-"  blast: Depends: xlib6g (>= 3.3-5) mais il n'est pas installé\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) mais il n'est pas installé\n"
 "  adduser: Depends: perl-base mais il n'est pas installé\n"
 "  aumix: Depends: libgpmg1 mais il n'est pas installé\n"
 "  debiandoc-sgml: Depends: sgml-base mais il n'est pas installé\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 mais il n'est pas installé\n"
-"           Depends: xlib6g (>= 3.3-5) mais il n'est pas installé\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) mais il n'est pas installé\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9211,89 +9261,97 @@ msgstr ""
 "paquet dont les dépendances ne sont pas satisfaites, indiquant quel est le "
 "problème. Une explication simple du problème est donnée."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"Cependant, APT prend en compte les dépendances connues et s'efforce d'éviter "
+"que cette situation ne se produise"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Il existe deux façons pour le système d'aboutir à cet état. Cela peut "
 "d'abord être causé par des subtilités de relations entre les paquets que "
-"<prgn>dpkg</prgn> aurait manquées lors de mises à jour. "
-"<footnote><p>Cependant, APT prend en compte les dépendances connues et "
-"s'efforce d'éviter que cette situation ne se produise</p></footnote>. Cela "
-"peut également être dû à l'échec antérieur d'une installation de paquet. "
-"Dans le cas présent, un paquet a pu être décompressé sans que ses "
-"dépendances ne soient satisfaites."
+"<command>dpkg</command> aurait manquées lors de mises à jour. <placeholder "
+"type=\"footnote\" id=\"0\"/>. Cela peut également être dû à l'échec "
+"antérieur d'une installation de paquet. Dans le cas présent, un paquet a pu "
+"être décompressé sans que ses dépendances ne soient satisfaites."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "La seconde situation est moins grave que la première car APT met certaines "
 "contraintes sur l'ordre d'installation des paquets. Dans les deux cas, "
-"l'option  <tt>-f</tt> utilisée avec <prgn>apt-get</prgn> conduira APT à "
-"rechercher une solution possible puis à continuer. La méthode APT de "
-"<prgn>dselect</prgn> utilise toujours cette option <tt>-f</tt> afin de "
-"pouvoir poursuivre plus facilement ses opérations si un script de mainteneur "
-"échoue de manière inopinée."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Cependant, si l'option <tt>-f</tt> est utilisée pour corriger un système "
-"fortement corrompu qui est dans le premier cas, il est possible que "
+"l'option  <literal>-f</literal> utilisée avec <command>apt-get</command> "
+"conduira APT à rechercher une solution possible puis à continuer. La méthode "
+"APT de <command>dselect</command> utilise toujours cette option <literal>-f</"
+"literal> afin de pouvoir poursuivre plus facilement ses opérations si un "
+"script de mainteneur échoue de manière inopinée."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Cependant, si l'option <literal>-f</literal> est utilisée pour corriger un "
+"système fortement corrompu qui est dans le premier cas, il est possible que "
 "l'opération échoue immédiatement ou au cours des diverses tentatives de "
 "réparation effectuées. Dans tous les cas, il peut être nécessaire de "
 "corriger la situation manuellement avec dpkg (éventuellement en utilisant "
 "des options pour forcer certains opérations) avant de pouvoir utiliser à "
 "nouveau APT."
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "Le rapport d'état"
 
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-"Avant de démarrer ses actions, <prgn>apt-get</prgn> en affiche un résumé. En "
-"général, ce rapport dépend du type d'opération qui est entreprise, mais de "
-"nombreux éléments sont communs aux différents types de rapports. Ainsi, dans "
-"tous les cas, les listes reflètent l'état final du système, en tenant compte "
-"de l'option <tt>-f</tt> et des autres opérations découlant du type de "
-"commande utilisée."
-
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
+msgid ""
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
+msgstr ""
+"Avant de démarrer ses actions, <command>apt-get</command> en affiche un "
+"résumé. En général, ce rapport dépend du type d'opération qui est "
+"entreprise, mais de nombreux éléments sont communs aux différents types de "
+"rapports. Ainsi, dans tous les cas, les listes reflètent l'état final du "
+"système, en tenant compte de l'option <literal>-f</literal> et des autres "
+"opérations découlant du type de commande utilisée."
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "La liste des paquets supplémentaires"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9301,86 +9359,86 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Les paquets supplémentaires suivants seront installés :\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "La liste des paquets supplémentaires montre tous les paquets installés ou "
 "mis à jour en plus de ceux indiqués à la ligne de commande. Elle n'apparaît "
-"qu'avec la commande <tt>install</tt>. Le plus souvent, les paquets concernés "
-"sont le résultat d'une installation automatique."
+"qu'avec la commande <literal>install</literal>. Le plus souvent, les paquets "
+"concernés sont le résultat d'une installation automatique."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "Les paquets à supprimer"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Les paquets suivants seront ENLEVÉS :\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "La liste des paquets à enlever montre tous les paquets qui seront supprimés "
 "du système. Elle peut apparaître pour tout type d'opération. Il est "
 "conseillé de l'inspecter en détail afin de vérifier qu'aucun paquet "
-"important ne va être supprimé. L'option  <tt>-f</tt> provoque notamment "
-"souvent des suppressions de paquets et il est déconseillé d'être "
+"important ne va être supprimé. L'option  <literal>-f</literal> provoque "
+"notamment souvent des suppressions de paquets et il est déconseillé d'être "
 "particulièrement attentif dans ce genre de cas. La liste peut comporter des "
 "paquets qui seront supprimés parce qu'ils sont seulement partiellement "
 "installés, par exemple après l'interruption d'une opération d'installation."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "La liste des nouveaux paquets"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Les NOUVEAUX paquets suivants seront installés :\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9390,58 +9448,58 @@ msgstr ""
 "avoir lieu. Les paquets affichés ne sont pas encore présents sur le système "
 "mais le seront une fois qu'APT aura terminé."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "La liste des paquets conservés"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Les paquets suivants ont été conservés :\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "À chaque fois que le système entier est mis à jour, il est possible que de "
 "nouvelles versions de paquets ne puissent pas être installées car elles ont "
 "besoins ne nouveaux paquets ou qu'elles entrent en conflit avec des paquets "
 "existants. Ces paquets apparaîtront alors dans la liste des paquets "
 "conservés. Le meilleure méthode pour effectivement installer ces paquets est "
-"souvent de le faire explicitement avec la commande <tt>apt-get install</tt> "
-"ou avec <prgn>dselect</prgn>."
+"souvent de le faire explicitement avec la commande <literal>apt-get install</"
+"literal> ou avec <command>dselect</command>."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "L'avertissement pour paquets retenus"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Les paquets retenus suivants seront changés :\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9452,32 +9510,32 @@ msgstr ""
 "que le paquet retenu va être modifié. Cela ne se produira que lors de "
 "l'utilisation des commandes dist-upgrade ou install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Résumé final"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Enfin, APT affichera un résumé de toutes les opérations qui prendront place."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
 "12 paquets partiellement installés ou enlevés.\n"
-"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
+"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9508,8 +9566,8 @@ msgstr ""
 "opérations. Si de nombreux paquets sont supprimés, cette valeur peut "
 "représenter l'espace qui est alors libéré."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9517,13 +9575,13 @@ msgstr ""
 "D'autres rapports peuvent être créés avec l'option -u qui affiche les "
 "paquets à mettre à jour. Il sont analogues aux exemples précédents."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "L'affichage d'état"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9531,8 +9589,8 @@ msgstr ""
 "Pendant le téléchargement des fichiers des paquets, APT affiche un certain "
 "nombre de messages d'avancement."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9541,7 +9599,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9549,71 +9607,73 @@ msgstr ""
 "Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
 "Les lignes qui débutent par « Réception de » sont affichées quand APT "
 "démarre la récupération d'un fichier alors que la dernière ligne indique la "
 "progression du téléchargement. La première valeur de pourcentage de la ligne "
 "est le pourcentage de téléchargement déjà effectué, pour l'ensemble des "
 "fichiers. Il faut noter que, comme la taille des fichiers de paquets n'est "
-"pas connue, <tt>apt-get update</tt> estime le pourcentage effectué ce qui "
-"peut conduire à des imprécisions."
+"pas connue, <literal>apt-get update</literal> estime le pourcentage effectué "
+"ce qui peut conduire à des imprécisions."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "La section suivante de la ligne d'état est répétée pour chaque sous-tâche de "
 "téléchargement. Elle indique l'opération effectuée et d'autres informations "
-"utiles sur ce qui est en cours. Cette section indiquera parfois <em>Forking</"
-"em> ce qui indique que le système charge le module de téléchargement. Le "
-"premier mot après le crochet ouvrant ([) est le numéro d'ordre de "
-"téléchargement comme indiqué dans les lignes d'historique. Le mot suivant "
-"est le nom court de l'objet téléchargé. Pour les archives, il s'agit du nom "
-"du paquet en cours de récupération."
+"utiles sur ce qui est en cours. Cette section indiquera parfois "
+"<emphasis>Forking</emphasis> ce qui indique que le système charge le module "
+"de téléchargement. Le premier mot après le crochet ouvrant ([) est le numéro "
+"d'ordre de téléchargement comme indiqué dans les lignes d'historique. Le mot "
+"suivant est le nom court de l'objet téléchargé. Pour les archives, il s'agit "
+"du nom du paquet en cours de récupération."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "À l'intérieur des guillemets, on trouve une information sur la progression "
 "de la phase de négociation du téléchargement. Usuellement, elle évolue de "
-"<em>Connexion</em> à <em>Attente du fichier</em>, puis <em>Téléchargement</"
-"em> ou <em>Reprise</em>. La valeur finale est le nombre d'octets téléchargés "
-"depuis le site distant. Une fois le téléchargement commencé, cette "
-"indication prend la forme <tt>102/10,2ko</tt>, ce qui indique que 102 octets "
-"ont été téléchargés et que 10,2 kilo-octets sont attendus. La taille totale "
-"est toujours représentées sur 4 digits pour des raisons de place disponible. "
+"<emphasis>Connexion</emphasis> à <emphasis>Attente du fichier</emphasis>, "
+"puis <emphasis>Téléchargement</emphasis> ou <emphasis>Reprise</emphasis>. La "
+"valeur finale est le nombre d'octets téléchargés depuis le site distant. Une "
+"fois le téléchargement commencé, cette indication prend la forme "
+"<literal>102/10,2ko</literal>, ce qui indique que 102 octets ont été "
+"téléchargés et que 10,2 kilo-octets sont attendus. La taille totale est "
+"toujours représentées sur 4 digits pour des raisons de place disponible. "
 "Après cet affichage de taille, se trouve une barre de progression pour le "
 "téléchargement du fichier lui-même. L'élément suivant est la vitesse "
 "instantanée de téléchargement. Elle est mise à jour toutes les 5 secondes et "
@@ -9622,57 +9682,52 @@ msgstr ""
 "régulièrement à jour et représete la durée estimée de téléchargement de "
 "toute ce qui est nécessaire, à la vitesse affichée."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "La ligne d'état est mise à jour chaque demi-seconde afin de fournir un "
 "retour régulier sur la progression du téléchargement alors que les lignes "
 "« Réception de » reculent d'une unité à chaque fois qu'un nouveau fichier "
 "est démarré. Comme l'état est mis à jour régulièrement, il ne peut pas "
 "servir pour la journalisation dans un fichier. Il est nécessaire d'utiliser "
-"l'option <tt>-q</tt> pour supprimer cet affichage."
+"l'option <literal>-q</literal> pour supprimer cet affichage."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT utilise <prgn>dpkg</prgn> pour installer les archives et bascule vers "
-"l'interface de ce programme une fois le téléchargement terminé. <prgn>dpkg</"
-"prgn> peut poser un certain nombre de questions pendant le traitement des "
-"paquets, qui peuvent eux-même être amener à poser des questions. Chacune de "
-"ces questions comporte un description de ce qui est attendu et elles sont "
-"trop variables d'un paquet à l'autre pour qu'une description détaillée soit "
-"donnée dans ce document."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT utilise <command>dpkg</command> pour installer les archives et bascule "
+"vers l'interface de ce programme une fois le téléchargement terminé. "
+"<command>dpkg</command> peut poser un certain nombre de questions pendant le "
+"traitement des paquets, qui peuvent eux-même être amener à poser des "
+"questions. Chacune de ces questions comporte un description de ce qui est "
+"attendu et elles sont trop variables d'un paquet à l'autre pour qu'une "
+"description détaillée soit donnée dans ce document."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "Utilisation d'APT hors ligne"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9681,23 +9736,25 @@ msgstr ""
 "réseau, et plus particulièrement une approche « sneaker-net » pour les mises "
 "à jour."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Introduction"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Aperçu"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9709,8 +9766,8 @@ msgstr ""
 "est celui d'une machine dotée d'une liaison peu rapide (comme un modem) avec "
 "une autre possédant une connexion à haut débit mais située à distance."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9718,9 +9775,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "Une solution est d'utiliser un support amovible de grande taille tel qu'un "
 "disque Zip ou un disque Superdisk (NdT : ce document est daté..:-)). Bien "
@@ -9731,11 +9788,12 @@ msgstr ""
 "récupérer avec une machine disposant d'une bonne connectivité. Il est même "
 "possible d'utiliser soit une autre machine Debian avec APT soit un autre "
 "système d'exploitation et un outil de téléchargement tel que wget. Dans ce "
-"qui suit, <em>machine distante</em> désignera la machine qui télécharge les "
-"paquets et <em>machine cible</em>, celle qui a une connectivité limitée."
+"qui suit, <emphasis>machine distante</emphasis> désignera la machine qui "
+"télécharge les paquets et <emphasis>machine cible</emphasis>, celle qui a "
+"une connectivité limitée."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9748,13 +9806,13 @@ msgstr ""
 "système de fichier autorisant les noms longs, par exemple ext2, fat32 ou "
 "vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "Utilisation d'APT sur les deux machines"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9767,8 +9825,8 @@ msgstr ""
 "et choisir ceux à télécharger. La structure des répertoires du disque "
 "devraient ressembler à :"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9778,7 +9836,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9787,42 +9845,44 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "Le fichier de configuration"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Le fichier de configuration indique à APT où conserver ses fichiers sur le "
 "disque et d'utiliser également les fichiers de configuration du disque. Le "
 "fichier sources.list devrait référencer les sites que vous souhaitez "
 "utiliser depuis la machine distante et le fichier d'état doit être une copie "
-"de <em>/var/lib/dpkg/status</em> de l'<em>ordinateur cible</em>. Veuillez "
-"noter que si sous utilisez une archive locale, les URI doivent en être "
-"copiés. La syntaxe est la même que celle des URI fichiers."
+"de <emphasis>/var/lib/dpkg/status</emphasis> de l'<emphasis>ordinateur "
+"cible</emphasis>. Veuillez noter que si sous utilisez une archive locale, "
+"les URI doivent en être copiés. La syntaxe est la même que celle des URI "
+"fichiers."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> doit avoir les informations nécessaires pour qu'APT "
-"utilise le disque.disc:"
+"<emphasis>apt.conf</emphasis> doit avoir les informations nécessaires pour "
+"qu'APT utilise le disque.disc:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9830,10 +9890,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9844,20 +9904,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9868,68 +9928,71 @@ msgstr ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Plus d'informations peuvent être trouvées dans la page de manuel du fichier "
 "apt.conf et dans l'exemple de fichier de configuration que l'on peut trouver "
-"dans <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"dans <emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Sur la machine cible, il est d'abord nécessaire de monter le disque et y "
-"copier le fichier <em>/var/lib/dpkg/status</em>. Il sera aussi nécessaire de "
-"créer les répertoires dans l'aperçu (Overview), <em>archives/partial/</em> "
-"and <em>lists/partial/</em>. Connecter ensuite le disque à la machine "
-"distante et configurer le fichier sources.list. Sur la machine distante, "
-"exécuter la séquence de commandes suivante :"
-
-#. type: <example></example>
-#: offline.sgml:142
+"copier le fichier <emphasis>/var/lib/dpkg/status</emphasis>. Il sera aussi "
+"nécessaire de créer les répertoires dans l'aperçu (Overview), "
+"<emphasis>archives/partial/</emphasis> and <emphasis>lists/partial/</"
+"emphasis>. Connecter ensuite le disque à la machine distante et configurer "
+"le fichier sources.list. Sur la machine distante, exécuter la séquence de "
+"commandes suivante :"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT récupère les fichiers des paquets ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]"
+" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "La commande dist-upgrade peut être remplacée par toute autres commande "
 "usuelle d'APT, notamment dselect-upgrade. Il est même possible d'utiliser "
-"une interface comme <em>dselect</em>. Cependant, cela complique la "
-"communication des choix vers l'ordinateur local."
+"une interface comme <emphasis>dselect</emphasis>. Cependant, cela complique "
+"la communication des choix vers l'ordinateur local."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9938,24 +10001,24 @@ msgstr ""
 "archives nécessaires pour mettr eà jour la machine cible. Il est alors "
 "possible d'y ramener le disque et exécuter :"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT crée la copie locale des fichiers de cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Ou toute autre commande APT ]"
+"  [ Ou toute autre commande APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9963,8 +10026,8 @@ msgstr ""
 "Pour un fonctionnement correct, il est indispensable de ré-indiquer que le "
 "fichier d'état est le fichier local. Cela est très important."
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9979,25 +10042,25 @@ msgstr ""
 "possible. NE COPIEZ PAS le fichier d'état si dpkg ou APT ont été exécutés "
 "dans l'intervalle."
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "Utilisation d'APT et wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> est un outil classique de téléchargement qui peut être exécuté "
-"sur à peu près tout type de machine. À la différence de la méthode "
-"précédente, cela impose que la machine Debian a déjà une liste des paquets "
-"disponibles."
+"<emphasis>wget</emphasis> est un outil classique de téléchargement qui peut "
+"être exécuté sur à peu près tout type de machine. À la différence de la "
+"méthode précédente, cela impose que la machine Debian a déjà une liste des "
+"paquets disponibles."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -10009,13 +10072,13 @@ msgstr ""
 "l'option --print-uris d'apt-get puis de la préparation d'un script wget "
 "permettant de récupérer les paquets/"
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Fonctionnement"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -10024,22 +10087,22 @@ msgstr ""
 "spécifique n'est nécessaire. Seules les commandes standard d'APT seront "
 "utilisées pour créer la liste de ficheirs."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -10047,8 +10110,8 @@ msgstr ""
 "Toute autre commande que dist-upgrade peut être utilisée, y compris dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10060,25 +10123,25 @@ msgstr ""
 "exécuté depuis le point de montage du disque afin que les fichiers soient "
 "écrits sur le disque."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "Sur la machine distante, il faudra alors exécuter l'équivalent de :"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ attendre.. ]"
+"  [ attendre.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10086,14 +10149,14 @@ msgstr ""
 "Une fois les fichiers téléchargés et le disque reconnecté à la machine "
 "Debian, l'installation peut se poursuivre avec :"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
diff --git a/doc/po/it.po b/doc/po/it.po
index f2a64ea7a..76d428272 100644
--- a/doc/po/it.po
+++ b/doc/po/it.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-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-04 00:45+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: it\n"
@@ -662,37 +662,37 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"IDchiave\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: 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
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: 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
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Descrizione"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -701,7 +701,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -710,14 +710,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 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
+#: apt.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
@@ -730,14 +730,14 @@ msgstr ""
 "di un pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 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
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -755,7 +755,7 @@ msgstr ""
 "(stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -770,14 +770,14 @@ msgstr ""
 "in mezzo), il pacchetto specificato viene installato invece che rimosso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 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
+#: apt.8.xml:95
 #, fuzzy
 #| msgid ""
 #| "<literal>showhold</literal> is used to print a list of packages on hold "
@@ -790,16 +790,16 @@ msgstr ""
 "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
+#: apt.8.xml:101
 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."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 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 "
@@ -807,19 +807,19 @@ msgid ""
 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
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "opzioni"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 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 "
@@ -829,12 +829,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 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 "
@@ -842,28 +842,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 #, 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
+#: apt.8.xml:151
 #, 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
+#: apt.8.xml:155
 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
+#: apt.8.xml:160
 #, fuzzy
 #| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
@@ -872,16 +872,16 @@ msgid ""
 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
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "Vedere anche"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-"
@@ -896,14 +896,14 @@ msgstr ""
 "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
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "Diagnostica"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
@@ -916,13 +916,13 @@ msgstr ""
 "e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 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
+#: apt-get.8.xml:35
 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 "
@@ -935,8 +935,8 @@ msgstr ""
 "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
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -945,7 +945,7 @@ msgstr ""
 "option>, deve essere presente uno dei comandi seguenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -969,7 +969,7 @@ msgstr ""
 "conoscere in anticipo la dimensione dei file degli indici dei pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -995,7 +995,7 @@ msgstr ""
 "command> sappia se sono disponibili nuove versioni dei pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1020,7 +1020,7 @@ msgstr ""
 "scavalcare le impostazioni generali per singoli pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1037,7 +1037,7 @@ msgstr ""
 "l'installazione di nuovi)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -1067,7 +1067,7 @@ msgstr ""
 "conflitti di apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1076,7 +1076,7 @@ msgstr ""
 "pacchetti e devono essere usati con cautela."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -1096,7 +1096,7 @@ msgstr ""
 "installata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1105,7 +1105,7 @@ msgstr ""
 "di installazione alternativa per i singoli pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -1125,7 +1125,7 @@ msgstr ""
 "o «$», oppure creare un'espressione regolare più specifica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1136,7 +1136,7 @@ msgstr ""
 "eliminato anche ogni file di configurazione)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1155,7 +1155,7 @@ msgstr ""
 "i singoli pacchetti con la sintassi <literal>pacch/rilascio</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1171,7 +1171,7 @@ msgstr ""
 "(troppo vecchia o troppo nuova) oppure nessuna versione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1186,7 +1186,7 @@ msgstr ""
 "download-only</option>, allora il pacchetto sorgente non verrà spacchettato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -1201,7 +1201,7 @@ msgstr ""
 "abilitando implicitamente l'opzione <literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1213,7 +1213,7 @@ msgstr ""
 "tar dei sorgenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1229,7 +1229,7 @@ msgstr ""
 "architecture</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1238,7 +1238,7 @@ msgstr ""
 "pacchetti e controlla la presenza di dipendenze non soddisfatte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1247,7 +1247,7 @@ msgstr ""
 "directory corrente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1260,7 +1260,7 @@ msgstr ""
 "file di lock."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1279,7 +1279,7 @@ msgstr ""
 "impedisce che vengano eliminati i pacchetti installati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1290,7 +1290,7 @@ msgstr ""
 "pacchetti e che non sono più necessari."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1313,7 +1313,7 @@ msgstr ""
 "opzioni del comando <option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1323,7 +1323,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1332,7 +1332,7 @@ msgstr ""
 "Voce di configurazione:<literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1342,7 +1342,7 @@ msgstr ""
 "Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 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 "
@@ -1370,7 +1370,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1390,7 +1390,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1401,7 +1401,7 @@ msgstr ""
 "scaricato. Voce di configurazione: <literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1421,7 +1421,7 @@ msgstr ""
 "qualcosa di inatteso. Voce di configurazione: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1432,7 +1432,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1451,7 +1451,7 @@ msgstr ""
 "bisogno di ulteriori avvertimenti da <literal>apt-get</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1467,7 +1467,7 @@ msgstr ""
 "hanno conseguenze (rari)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1484,7 +1484,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1493,7 +1493,7 @@ msgstr ""
 "<literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1503,7 +1503,7 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1512,7 +1512,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1529,7 +1529,7 @@ msgstr ""
 "di configurazione: <literal>APT::Get::Host-Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 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 "
@@ -1545,7 +1545,7 @@ msgstr ""
 "configurazione: <literal>APT::Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1554,7 +1554,7 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1567,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:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1586,7 +1586,7 @@ msgstr ""
 "Voce di configurazione: <literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1599,7 +1599,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1613,7 +1613,7 @@ msgstr ""
 "Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1629,7 +1629,7 @@ msgstr ""
 "yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1650,7 +1650,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 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. "
@@ -1663,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:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1672,7 +1672,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 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 "
@@ -1689,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:472
+#: apt-get.8.xml:466
 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 "
@@ -1713,7 +1713,7 @@ msgstr ""
 "pagina di manuale di &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1727,7 +1727,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1737,7 +1737,7 @@ msgstr ""
 "Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1751,7 +1751,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 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 "
@@ -1770,7 +1770,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 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</"
@@ -1781,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:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1790,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:529
+#: apt-get.8.xml:523
 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::"
@@ -1801,7 +1801,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 #, fuzzy
 #| msgid ""
 #| "Show user friendly progress information in the terminal window when "
@@ -1824,13 +1824,13 @@ msgstr ""
 "Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "File"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1841,7 +1841,7 @@ msgstr ""
 "l'APT Howto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1850,12 +1850,12 @@ msgstr ""
 "e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "interroga la cache di APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1868,7 +1868,7 @@ msgstr ""
 "interessanti partendo dai metadati dei pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1878,14 +1878,14 @@ msgstr ""
 "essa manca o non è aggiornata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1908,7 +1908,7 @@ msgstr ""
 "showpkg libreadline2</command> produce un risultato simile al seguente:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1934,7 +1934,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -1953,7 +1953,7 @@ msgstr ""
 "consultare il codice sorgente di apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1962,7 +1962,7 @@ msgstr ""
 "previsti ulteriori argomenti. Le statistiche riportate sono:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1971,7 +1971,7 @@ msgstr ""
 "pacchetto trovati nella cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1984,7 +1984,7 @@ msgstr ""
 "dipendenze. La maggioranza dei pacchetti ricade in questa categoria."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -2001,7 +2001,7 @@ msgstr ""
 "agent», ma non c'è alcun pacchetto chiamato «mail-transport-agent»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2014,7 +2014,7 @@ msgstr ""
 "pacchetto, xless, fornisce «X11-text-viewer»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2027,7 +2027,7 @@ msgstr ""
 "sia un pacchetto vero e proprio, sia è fornito dal pacchetto debconf-tiny."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2043,7 +2043,7 @@ msgstr ""
 "Conflicts o Breaks."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -2058,7 +2058,7 @@ msgstr ""
 "essere decisamente più grande del numero dei nomi totali di pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2067,7 +2067,7 @@ msgstr ""
 "dichiarate da tutti i pacchetti nella cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2079,7 +2079,7 @@ msgstr ""
 "pacchetto binario."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2088,7 +2088,7 @@ msgstr ""
 "cache. Serve soprattutto a scopo di debug."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2097,7 +2097,7 @@ msgstr ""
 "stdout. Questa è adatta all'uso con &dpkg; ed è usata dal metodo &dselect;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2106,7 +2106,7 @@ msgstr ""
 "soddisfatte nella cache dei pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2115,12 +2115,12 @@ msgstr ""
 "avail</command>; mostra i record dei pacchetti per i pacchetti specificati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2143,7 +2143,7 @@ msgstr ""
 "descrizione lunga."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2152,7 +2152,7 @@ msgstr ""
 "che vengono combinati con un AND."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2162,7 +2162,7 @@ msgstr ""
 "dipendenza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2171,12 +2171,12 @@ msgstr ""
 "di un pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -2191,7 +2191,7 @@ msgstr ""
 "viene usato al meglio con l'opzione <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -2202,7 +2202,7 @@ msgstr ""
 "virtuali sono anch'essi compresi nell'elenco generato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2224,7 +2224,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2238,14 +2238,14 @@ msgstr ""
 "blu sono pre-dipendenze, le linee verdi sono conflitti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Attenzione: dotty non può creare i grafi degli insiemi più grandi di "
 "pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2255,12 +2255,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -2273,7 +2273,7 @@ msgstr ""
 "di priorità del pacchetto indicato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -2292,7 +2292,7 @@ msgstr ""
 "elenchi dei pacchetti (<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2303,7 +2303,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2319,7 +2319,7 @@ msgstr ""
 "configurazione: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2333,7 +2333,7 @@ msgstr ""
 "configurazione. Voce di configurazione: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2345,7 +2345,7 @@ msgstr ""
 "Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2360,7 +2360,7 @@ msgstr ""
 "literal>, ad es. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2369,7 +2369,7 @@ msgstr ""
 "configurazione: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2387,7 +2387,7 @@ msgstr ""
 "AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2399,7 +2399,7 @@ msgstr ""
 "<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2408,7 +2408,7 @@ msgstr ""
 "configurazione: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2419,7 +2419,7 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2430,7 +2430,7 @@ msgstr ""
 "configurazione: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2441,12 +2441,12 @@ msgstr ""
 "Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2455,12 +2455,12 @@ msgstr ""
 "normale e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "strumento APT per la gestione delle chiavi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -2471,12 +2471,12 @@ msgstr ""
 "autenticati usando queste chiavi verranno considerati fidati."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Comandi"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2487,33 +2487,33 @@ msgstr ""
 "il nome file è <literal>-</literal>, dallo standard input."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "Rimuove una chiave dall'elenco delle chiavi fidate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 "Visualizza sullo standard output l'&synopsis-param-keyid; della chiave."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "Visualizza sullo standard output tutte le chiavi fidate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "Elenca le chiavi fidate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "Elenca le impronte digitali delle chiavi fidate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2522,7 +2522,7 @@ msgstr ""
 "chiave pubblica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2536,7 +2536,7 @@ msgstr ""
 "package; in &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2554,12 +2554,12 @@ msgstr ""
 "<command>update</command>; APT in Ubuntu invece lo fa."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Opzioni"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2568,7 +2568,7 @@ msgstr ""
 "nella sezione precedente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2585,49 +2585,49 @@ msgstr ""
 "che le nuove chiavi sono aggiunte ad esso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "Database locale di fiducia delle chiavi archiviate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Portachiavi delle chiavi fidate degli archivi &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Portachiavi delle chiavi fidate rimosse degli archivi &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 "mette/toglie il contrassegno di automaticamente installato ai pacchetti"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2636,7 +2636,7 @@ msgstr ""
 "indica se è stato installato automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -2652,7 +2652,7 @@ msgstr ""
 "get</command> o <command>aptitude</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2664,7 +2664,7 @@ msgstr ""
 "esso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2675,7 +2675,7 @@ msgstr ""
 "automaticamente se nessun altro dipende da esso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2690,7 +2690,7 @@ msgstr ""
 "&dpkg; e non è influenzato dall'opzione <option>--file</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2699,7 +2699,7 @@ msgstr ""
 "precedenza, per permettere nuovamente tutte le azioni."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2713,7 +2713,7 @@ msgstr ""
 "solo quelli automaticamente installati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2724,7 +2724,7 @@ msgstr ""
 "dei pacchetti installati manualmente"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2733,7 +2733,7 @@ msgstr ""
 "bloccati in modo uguale a ciò che fanno gli altri comandi «show»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2746,7 +2746,7 @@ msgstr ""
 "voce di configurazione <literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2755,12 +2755,12 @@ msgstr ""
 "normale e un valore diverso da zero in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "supporto per l'autenticazione degli archivi per APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -2773,7 +2773,7 @@ msgstr ""
 "non hanno accesso alla chiave di firma dei file Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 msgid ""
 "If a package comes from a archive without a signature, or with a signature "
 "that apt does not have a key for, that package is considered untrusted, and "
@@ -2789,7 +2789,7 @@ msgstr ""
 "scaricare pacchetti da esse."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2798,12 +2798,12 @@ msgstr ""
 "questa nuova funzionalità di autenticazione."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Archivi fidati"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2821,7 +2821,7 @@ msgstr ""
 "dell'archivio."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2834,7 +2834,7 @@ msgstr ""
 "verify e devscripts)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. In order to become "
@@ -2852,7 +2852,7 @@ msgstr ""
 "del proprietario della chiave."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2874,7 +2874,7 @@ msgstr ""
 "&keyring-package;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2886,7 +2886,7 @@ msgstr ""
 "ad APT che lo fa automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2895,7 +2895,7 @@ msgstr ""
 "È progettato per prevenire due possibili attacchi:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2910,7 +2910,7 @@ msgstr ""
 "server cattivo (attraverso attacchi di falsificazione di DNS e ARP)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2923,7 +2923,7 @@ msgstr ""
 "gli utenti che scaricano i pacchetti da quell'host."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2936,12 +2936,12 @@ msgstr ""
 "firme a livello di singolo pacchetto."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Configurazione utente"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys, although an installation of "
@@ -2955,7 +2955,7 @@ msgstr ""
 "pacchetti Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2972,12 +2972,12 @@ msgstr ""
 "filename> dagli archivi che sono configurati."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Configurazione dell'archivio"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2986,7 +2986,7 @@ msgstr ""
 "si deve:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2997,7 +2997,7 @@ msgstr ""
 "command> (fornito in apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -3008,7 +3008,7 @@ msgstr ""
 "Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -3019,7 +3019,7 @@ msgstr ""
 "i file nell'archivio."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3030,16 +3030,16 @@ msgstr ""
 "primi due passi descritti sopra."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3056,12 +3056,12 @@ msgstr ""
 "Distribution HOWTO</ulink> di V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Autori della pagina di manuale"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -3070,12 +3070,12 @@ msgstr ""
 "Peña, Isaac Jones, Colin Walters, Florian Weimer e Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "strumento APT per la gestione dei CD-ROM"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3088,7 +3088,7 @@ msgstr ""
 "possibili errori di masterizzazione e di verificare i file indice."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -3100,7 +3100,7 @@ msgstr ""
 "tenere conto di possibili errori di masterizzazione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3115,7 +3115,7 @@ msgstr ""
 "descrittivo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3126,7 +3126,7 @@ msgstr ""
 "file <filename>&statedir;/cdroms.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3135,7 +3135,7 @@ msgstr ""
 "il nome dei file memorizzato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
@@ -3146,7 +3146,7 @@ msgstr ""
 "<literal>Acquire::cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 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.  "
@@ -3158,7 +3158,7 @@ msgstr ""
 "cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3170,7 +3170,7 @@ msgstr ""
 "Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3181,7 +3181,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3194,7 +3194,7 @@ msgstr ""
 "errore. Voce di configurazione: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3206,7 +3206,7 @@ msgstr ""
 "più tempo, ma troverà tutti i file."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3217,12 +3217,12 @@ msgstr ""
 "<literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3231,12 +3231,12 @@ msgstr ""
 "normale e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "programma di interrogazione della configurazione di APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3249,7 +3249,7 @@ msgstr ""
 "modo facile da usare da parte di applicazioni che usano script."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -3265,7 +3265,7 @@ msgstr ""
 "modo simile a:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3277,7 +3277,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3287,7 +3287,7 @@ msgstr ""
 "option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -3298,12 +3298,12 @@ msgstr ""
 "un intero. Ogni valore restituito è normalizzato e verificato internamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Mostra soltanto i contenuti dello spazio di configurazione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3312,12 +3312,12 @@ msgstr ""
 "predefinito, perciò usare --no-empty per rimuoverle dall'output."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3336,13 +3336,13 @@ msgstr ""
 "&percnt;. "
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3351,27 +3351,27 @@ msgstr ""
 "normale e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Documentazione iniziale di Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "file di configurazione di APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3385,7 +3385,7 @@ msgstr ""
 "ambiente uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3394,7 +3394,7 @@ msgstr ""
 "seguente ordine:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3403,7 +3403,7 @@ msgstr ""
 "presente)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3423,7 +3423,7 @@ msgstr ""
 "silenziosamente."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3431,7 +3431,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3440,12 +3440,12 @@ msgstr ""
 "di configurazione o per caricare ulteriori file di configurazione."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Sintassi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3460,7 +3460,7 @@ msgstr ""
 "Le opzioni non ereditano dai gruppi genitori."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3485,7 +3485,7 @@ msgstr ""
 "parentesi graffe come in:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3503,7 +3503,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -3515,13 +3515,13 @@ msgstr ""
 "voci, separate da un punto e virgola."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3530,7 +3530,7 @@ msgstr ""
 "buona guida su come debba essere un file di configurazione."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3540,7 +3540,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3555,7 +3555,7 @@ msgstr ""
 "sovrascrivere l'opzione come per ogni altra, assegnandole un nuovo valore."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3575,7 +3575,7 @@ msgstr ""
 "queste righe devono terminare con un punto e virgola.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3591,7 +3591,7 @@ msgstr ""
 "ambiti non possono essere sovrascritti, solo cancellati."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3611,7 +3611,7 @@ msgstr ""
 "di comando.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3641,12 +3641,12 @@ msgstr ""
 "ora, quando APT ancora non si lamenta esplicitamente."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "Il gruppo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3655,7 +3655,7 @@ msgstr ""
 "contenere le opzioni per tutti gli strumenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3666,7 +3666,7 @@ msgstr ""
 "predefinito interno è l'architettura per la quale apt è stato compilato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3688,7 +3688,7 @@ msgstr ""
 "quando sono registrate con <command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3702,7 +3702,7 @@ msgstr ""
 "precedenza sulla notazione della lista."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3716,7 +3716,7 @@ msgstr ""
 "preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3725,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:201
+#: apt.conf.5.xml:195
 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 "
@@ -3739,7 +3739,7 @@ msgstr ""
 "reinstallarli."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 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 "
@@ -3766,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:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3796,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:234
+#: apt.conf.5.xml:228
 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 "
@@ -3814,7 +3814,7 @@ msgstr ""
 "il processo di aggiornamento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 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 "
@@ -3835,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:257
+#: apt.conf.5.xml:251
 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 "
@@ -3873,14 +3873,14 @@ msgstr ""
 "della cache è disabilitata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 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:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3889,7 +3889,7 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3898,7 +3898,7 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3907,12 +3907,12 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "Il gruppo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3923,7 +3923,7 @@ msgstr ""
 "scaricamento stesso (vedere anche &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3945,7 +3945,7 @@ msgstr ""
 "ValidTime</literal> seguente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3965,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:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3985,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:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3996,7 +3996,7 @@ msgstr ""
 "interamente i nuovi. Attiva in modo predefinito."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 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 "
@@ -4014,7 +4014,7 @@ msgstr ""
 "completo invece delle patch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4029,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:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4039,7 +4039,7 @@ msgstr ""
 "ha avuto successo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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."
@@ -4050,7 +4050,7 @@ msgstr ""
 "vero."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 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]/</"
@@ -4069,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:377
+#: apt.conf.5.xml:371
 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 "
@@ -4089,7 +4089,7 @@ msgstr ""
 "file .deb."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 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."
@@ -4099,7 +4099,7 @@ msgstr ""
 "quello per i dati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 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."
@@ -4119,7 +4119,7 @@ msgstr ""
 "con la specifica HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4128,7 +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:400
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4143,7 +4143,7 @@ msgstr ""
 "scaricamento da più server contemporaneamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4155,7 +4155,7 @@ msgstr ""
 "conosciuto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 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 "
@@ -4178,7 +4178,7 @@ msgstr ""
 "sull'opzione col nome obsoleto <literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4195,7 +4195,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal> non è ancora supportata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4236,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:458
+#: apt.conf.5.xml:452
 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]/</"
@@ -4270,7 +4270,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4286,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:485
+#: apt.conf.5.xml:479
 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 "
@@ -4300,7 +4300,7 @@ msgstr ""
 "a causa della sua bassa efficienza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4316,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:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"pippo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4344,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:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4353,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:523
+#: apt.conf.5.xml:517
 #, 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:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4378,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:528
+#: apt.conf.5.xml:522
 #, 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:531
+#: apt.conf.5.xml:525
 #, 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:524
+#: apt.conf.5.xml:518
 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 "
@@ -4421,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:538
+#: apt.conf.5.xml:532
 #, 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:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4453,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:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4465,7 +4465,7 @@ msgstr ""
 "soprattutto per i mirror locali."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4479,7 +4479,7 @@ msgstr ""
 "modo predefinito è disabilitato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4498,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:575
+#: apt.conf.5.xml:569
 #, 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:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4543,7 +4543,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4557,22 +4557,22 @@ msgstr ""
 "implicito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr "Durante gli scaricamenti, forza l'uso del solo protocollo IPv4."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Durante gli scaricamenti, forza l'uso del solo protocollo IPv6."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4592,16 +4592,28 @@ msgstr ""
 "<filename>/</filename> o <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contiene le posizioni relative alle "
 "informazioni della cache locale, come le due cache dei pacchetti "
@@ -4614,7 +4626,7 @@ msgstr ""
 "la directory predefinita è contenuta in <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4629,7 +4641,7 @@ msgstr ""
 "configurazione specificato da <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4640,7 +4652,7 @@ msgstr ""
 "termine viene caricato il file di configurazione principale."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4657,7 +4669,7 @@ msgstr ""
 "specificano la posizione dei rispettivi programmi."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4678,7 +4690,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4696,12 +4708,12 @@ msgstr ""
 "questi modelli possono usare una sintassi con espressioni regolari."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4712,7 +4724,7 @@ msgstr ""
 "sezione <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4734,7 +4746,7 @@ msgstr ""
 "scaricare i nuovi pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4744,7 +4756,7 @@ msgstr ""
 "installazione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: 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 update phase."
@@ -4754,7 +4766,7 @@ msgstr ""
 "aggiornamento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4764,12 +4776,12 @@ msgstr ""
 "solo in caso di errore."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "Come APT invoca &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4778,7 +4790,7 @@ msgstr ""
 "&dpkg;; sono nella sezione <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4789,7 +4801,7 @@ msgstr ""
 "passata a &dpkg; come un singolo argomento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4802,7 +4814,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:712
+#: apt.conf.5.xml:707
 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 "
@@ -4820,7 +4832,7 @@ msgstr ""
 "lo standard input."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4834,7 +4846,7 @@ msgstr ""
 "versione di cui viene fatto il dump."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4851,7 +4863,7 @@ msgstr ""
 "l'informazione nella versione più alta per cui ha il supporto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4869,7 +4881,7 @@ msgstr ""
 "file usato per conferma."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4878,7 +4890,7 @@ msgstr ""
 "valore predefinito è <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4888,12 +4900,12 @@ msgstr ""
 "binari."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 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:752
+#: apt.conf.5.xml:747
 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 "
@@ -4921,7 +4933,7 @@ msgstr ""
 "pacchetti."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4935,7 +4947,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4959,7 +4971,7 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4981,7 +4993,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:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5011,7 +5023,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:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5029,7 +5041,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:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5045,7 +5057,7 @@ msgstr ""
 "necessari per configurare il pacchetto in questione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5063,7 +5075,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 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 "
@@ -5088,12 +5100,12 @@ msgstr ""
 "con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Opzioni Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5107,12 +5119,12 @@ msgstr ""
 "all'inizio dello script."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "Opzioni di debug"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5130,7 +5142,7 @@ msgstr ""
 "esserlo:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5141,7 +5153,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5152,7 +5164,7 @@ msgstr ""
 "install</literal>) come utente non root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5164,7 +5176,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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5173,37 +5185,37 @@ msgstr ""
 "negli ID dei CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 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:896
+#: apt.conf.5.xml:891
 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:907
+#: apt.conf.5.xml:902
 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:918
+#: apt.conf.5.xml:913
 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:929
+#: apt.conf.5.xml:924
 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:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5212,7 +5224,7 @@ msgstr ""
 "usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5221,14 +5233,14 @@ msgstr ""
 "pacchetti memorizzati su CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 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:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5237,7 +5249,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5248,7 +5260,7 @@ msgstr ""
 "system del CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5258,14 +5270,14 @@ msgstr ""
 "contemporaneamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 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:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5274,7 +5286,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:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5284,7 +5296,7 @@ msgstr ""
 "diff."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5294,7 +5306,7 @@ msgstr ""
 "invece degli indici completi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5302,7 +5314,7 @@ msgstr ""
 "realmente gli scaricamenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5311,7 +5323,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:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5327,7 +5339,7 @@ msgstr ""
 "pkgProblemResolver</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5359,7 +5371,7 @@ msgstr ""
 "sezione in cui compare il pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5368,7 +5380,7 @@ msgstr ""
 "gli argomenti separati da un singolo carattere di spazio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5377,7 +5389,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:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5386,7 +5398,7 @@ msgstr ""
 "literal> deve passare i pacchetti a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5394,12 +5406,12 @@ msgstr ""
 "nell'invocazione di &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 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:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5409,7 +5421,7 @@ msgstr ""
 "dipendenze)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5420,7 +5432,7 @@ msgstr ""
 "la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5429,7 +5441,7 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 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 "
@@ -5437,13 +5449,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Esempi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5453,17 +5465,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "file di controllo delle preferenze per APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5476,7 +5488,7 @@ msgstr ""
 "selezionata per l'installazione."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5499,7 +5511,7 @@ msgstr ""
 "l'installazione."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -5514,7 +5526,7 @@ msgstr ""
 "effetto sulla scelta dell'istanza, ma solo sulla scelta della versione."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -5539,7 +5551,7 @@ msgstr ""
 "avvertiti."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5561,24 +5573,24 @@ msgstr ""
 "viene ignorato in modo silenzioso."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "Assegnazioni della priorità predefinite di APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>un-pacchetto</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -5606,7 +5618,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
@@ -5615,12 +5627,12 @@ msgstr ""
 "algoritmo per impostare le priorità delle versioni di un pacchetto. Assegna:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "priorità 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5633,12 +5645,12 @@ msgstr ""
 "<literal>experimental</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "priorità 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5652,12 +5664,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "priorità 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -5666,19 +5678,19 @@ msgstr ""
 "obiettivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "priorità 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
 "alle versioni che non sono installate e appartengono al rilascio obiettivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -5696,7 +5708,7 @@ msgstr ""
 "contrassegnate come «ButAutomaticUpgrades: yes»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5705,7 +5717,7 @@ msgstr ""
 "seguenti regole, elencate in ordine di precedenza."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5722,12 +5734,12 @@ msgstr ""
 "rischioso.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "Installa la versione con la priorità più alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5736,7 +5748,7 @@ msgstr ""
 "recente (cioè quella con il numero di versione più alto)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5748,7 +5760,7 @@ msgstr ""
 "non installata."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5764,7 +5776,7 @@ msgstr ""
 "upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5778,7 +5790,7 @@ msgstr ""
 "upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5797,12 +5809,12 @@ msgstr ""
 "priorità più alta di quella installata."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "L'effetto delle preferenze di APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5815,7 +5827,7 @@ msgstr ""
 "due forme: una forma specifica e una forma generica."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5832,7 +5844,7 @@ msgstr ""
 "spazi."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5844,7 +5856,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -5859,7 +5871,7 @@ msgstr ""
 "identificato in base al suo nome di dominio pienamente qualificato."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -5870,7 +5882,7 @@ msgstr ""
 "priorità alta a tutte le versioni di pacchetto disponibili dal sito locale."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5882,7 +5894,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -5895,7 +5907,7 @@ msgstr ""
 "identificato dal nome host «ftp.de.debian.org»"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5907,7 +5919,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5922,7 +5934,7 @@ msgstr ""
 "«Ximian»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5933,7 +5945,7 @@ msgstr ""
 "archivio è «<literal>unstable</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5945,7 +5957,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5956,7 +5968,7 @@ msgstr ""
 "codice è «<literal>&testing-codename;</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5968,7 +5980,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5980,7 +5992,7 @@ msgstr ""
 "«<literal>&stable-version;</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5993,12 +6005,12 @@ msgstr ""
 
 # &glob; è rimpiazzato da "glob(7)"
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Sintassi per le espressioni regolari e &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -6014,7 +6026,7 @@ msgstr ""
 "POSIX racchiusa tra sbarre)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -6026,7 +6038,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6037,7 +6049,7 @@ msgstr ""
 "provenienti da un rilascio il cui nome inizia con &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6049,7 +6061,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6068,12 +6080,12 @@ msgstr ""
 "non viene considerato come un'espressione &glob;."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Come APT interpreta le priorità"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6083,12 +6095,12 @@ msgstr ""
 "seguente (semplificando le cose):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6097,12 +6109,12 @@ msgstr ""
 "retrocessione del pacchetto"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6111,12 +6123,12 @@ msgstr ""
 "obiettivo, a meno che la versione installata non sia più recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -6126,12 +6138,12 @@ msgstr ""
 "sia più recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -6141,12 +6153,12 @@ msgstr ""
 "installata non sia più recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -6155,17 +6167,17 @@ msgstr ""
 "è installata"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "impedisce l'installazione della versione"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6180,7 +6192,7 @@ msgstr ""
 "versione del pacchetto."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6189,7 +6201,7 @@ msgstr ""
 "record descritti in precedenza:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6217,12 +6229,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Allora:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -6237,7 +6249,7 @@ msgstr ""
 "installata è &bad-perl;*, allora <literal>perl</literal> verrà retrocesso."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6248,7 +6260,7 @@ msgstr ""
 "versioni, incluse quelle che appartengono al rilascio obiettivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6262,13 +6274,13 @@ msgstr ""
 "installata."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 "Determinazione delle proprietà di versione del pacchetto e di distribuzione"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6279,7 +6291,7 @@ msgstr ""
 "i pacchetti disponibili in quelle posizioni."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6298,27 +6310,27 @@ msgstr ""
 "righe sono rilevanti per l'impostazione delle priorità di APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "la riga <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "indica il nome del pacchetto"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "la riga <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "indica il numero di versione per il pacchetto indicato"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6340,12 +6352,12 @@ msgstr ""
 "priorità di APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "la riga <literal>Archive:</literal> o <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6362,18 +6374,18 @@ msgstr ""
 "preferenze di APT si deve usare la riga:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "la riga <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6390,13 +6402,13 @@ msgstr ""
 "valore nelle preferenze di APT si deve usare la riga:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6413,7 +6425,7 @@ msgstr ""
 "APT si deve usare una delle seguenti righe:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6425,12 +6437,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "la riga<literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6448,18 +6460,18 @@ msgstr ""
 "usare la riga:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "la riga <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6471,18 +6483,18 @@ msgstr ""
 "specificare questa origine nelle preferenze di APT si deve usare la riga:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "la riga <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6494,13 +6506,13 @@ msgstr ""
 "specificare questa etichetta nelle preferenze di APT si deve usare la riga:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6525,12 +6537,12 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Righe opzionali in un record delle preferenze di APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6541,12 +6553,12 @@ msgstr ""
 "literal>. Ciò fornisce un posto dove mettere commenti."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Seguire Stable in modo continuativo"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6571,7 +6583,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6587,8 +6599,8 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6600,7 +6612,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6613,13 +6625,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pacchetto</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6632,12 +6644,12 @@ msgstr ""
 "nuovamente questo comando. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Seguire Testing o Unstable in modo continuativo"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6665,7 +6677,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6682,7 +6694,7 @@ msgstr ""
 "literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6695,13 +6707,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pacchetto</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6720,12 +6732,12 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Seguire l'evoluzione di un rilascio in base al nome in codice"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6760,7 +6772,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6787,7 +6799,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6800,13 +6812,13 @@ msgstr ""
 "codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pacchetto</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6825,17 +6837,17 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "elenco delle fonti di dati configurate per APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6852,7 +6864,7 @@ msgstr ""
 "interfaccia per APT)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6867,12 +6879,12 @@ msgstr ""
 "punto di una riga contrassegna come commento la parte rimanente della riga."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -6894,12 +6906,12 @@ msgstr ""
 "caso viene ignorato in modo silenzioso."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "I tipi deb e deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6925,7 +6937,7 @@ msgstr ""
 "riga <literal>deb-src</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6934,13 +6946,13 @@ msgstr ""
 "<literal>deb</literal> o <literal>deb-src</literal> è:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ opzioni ] uri suite [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6980,7 +6992,7 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
@@ -6989,7 +7001,7 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 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.  "
@@ -7010,7 +7022,7 @@ msgstr ""
 "esatto, deve essere presente almeno una <literal>componente</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7029,7 +7041,7 @@ msgstr ""
 "automaticamente un URI con l'architettura corrente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 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 "
@@ -7058,7 +7070,7 @@ msgstr ""
 "larghezza di banda."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -7075,7 +7087,7 @@ msgstr ""
 "supportate verranno ignorate in modo silenzioso):"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7090,7 +7102,7 @@ msgstr ""
 "Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
@@ -7104,7 +7116,7 @@ msgstr ""
 "scaricate."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -7121,7 +7133,7 @@ msgstr ""
 "tratta anche le fonti correttamente autenticate come non autenticate."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -7134,12 +7146,12 @@ msgstr ""
 "in una rete locale, seguiti da host Internet distanti)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Alcuni esempi:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7151,17 +7163,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "Specificare URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "I tipi di URI attualmente riconosciuti sono:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7172,7 +7184,7 @@ msgstr ""
 "archivi locali."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7182,7 +7194,7 @@ msgstr ""
 "delle fonti."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7199,7 +7211,7 @@ msgstr ""
 "è un metodo di autenticazione non sicuro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7219,7 +7231,7 @@ msgstr ""
 "HTTP specificati nel file di configurazione verranno ignorati."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -7232,7 +7244,7 @@ msgstr ""
 "rimovibili, per copiare i file nelle varie posizioni con APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7246,12 +7258,12 @@ msgstr ""
 "command> e <command>dd</command>."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "aggiungere ulteriori tipi di URI riconoscibili"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7270,7 +7282,7 @@ msgstr ""
 "debtorrrent; vedere &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7279,37 +7291,37 @@ msgstr ""
 "debian per stable/main, stable/contrib e stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/gianni/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Come sopra, tranne per il fatto che usa la distribuzione unstable (di "
 "sviluppo)"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/gianni/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "Riga per i sorgenti corrispondente alla precedente"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/gianni/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7320,7 +7332,7 @@ msgstr ""
 "<literal>amd64</literal> e <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7330,7 +7342,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7339,13 +7351,13 @@ msgstr ""
 "hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7354,13 +7366,13 @@ msgstr ""
 "e usa solo l'area &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7373,19 +7385,19 @@ msgstr ""
 "usata una sola sessione FTP per entrambe le righe."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7404,17 +7416,17 @@ msgstr ""
 "modo.] <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7423,7 +7435,7 @@ msgstr ""
 "pacchetti Debian"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7438,12 +7450,12 @@ msgstr ""
 "output nel formato:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "pacchetto versione file-template script-di-configurazione"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7458,7 +7470,7 @@ msgstr ""
 "<filename>pacchetto.config.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7469,7 +7481,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7478,12 +7490,12 @@ msgstr ""
 "funzionamento normale e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "utilità per ordinare i file indice dei pacchetti"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -7495,7 +7507,7 @@ msgstr ""
 "i campi interni ad ogni record in base alle regole di ordinamento interne."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7503,7 +7515,7 @@ msgstr ""
 "file leggibile con seek."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7512,7 +7524,7 @@ msgstr ""
 "configurazione: <literal>APT::SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7521,12 +7533,12 @@ msgstr ""
 "normale e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "strumento per generare file indice"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -7539,7 +7551,7 @@ msgstr ""
 "di tale sito."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7554,7 +7566,7 @@ msgstr ""
 "tramite script il processo di generazione per un archivio completo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -7569,7 +7581,7 @@ msgstr ""
 "compressi desiderati in uscita."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7582,7 +7594,7 @@ msgstr ""
 "equivalente a &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7590,7 +7602,7 @@ msgstr ""
 "binario da usare come cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7603,7 +7615,7 @@ msgstr ""
 "comando è più o meno equivalente a &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -7614,7 +7626,7 @@ msgstr ""
 "per cambiare il file override sorgente da usare."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7631,7 +7643,7 @@ msgstr ""
 "stesso file, ciascun pacchetto è separato da una virgola nell'output."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7656,7 +7668,7 @@ msgstr ""
 "filename> contenente per ogni file un digest MD5, SHA1 e SHA256."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7677,7 +7689,7 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -7693,7 +7705,7 @@ msgstr ""
 "impostazioni desiderate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7702,12 +7714,12 @@ msgstr ""
 "configurazione dato, rimuovendo tutti i record non più necessari."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "La configurazione di generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7724,7 +7736,7 @@ msgstr ""
 "Ciò ha effetto soltanto sulla gestione del tag di ambito."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7732,12 +7744,12 @@ msgstr ""
 "quali è descritta in seguito."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "Sezione <literal>Dir</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7750,7 +7762,7 @@ msgstr ""
 "sezioni successive, per produrre un percorso assoluto completo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -7760,17 +7772,17 @@ msgstr ""
 "questa è la directory che contiene i nodi <filename>ls-LR</filename> e dist."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "Specifica la posizione dei file override."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "Specifica la posizione dei file cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7779,12 +7791,12 @@ msgstr ""
 "l'impostazione <literal>FileList</literal> sotto."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "Sezione <literal>Default</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7795,7 +7807,7 @@ msgstr ""
 "possono scavalcare questi valori tramite impostazioni definite per sezione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -7808,7 +7820,7 @@ msgstr ""
 "predefinito per tutti gli schemi di compressione è «. gzip»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7817,7 +7829,7 @@ msgstr ""
 "file dei pacchetti. Il valore predefinito è «.deb»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7826,7 +7838,7 @@ msgstr ""
 "controlla la compressione dei file Sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7835,7 +7847,7 @@ msgstr ""
 "sorgenti. Il valore predefinito è «.dsc»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7844,7 +7856,7 @@ msgstr ""
 "controlla la compressione dei file Contents."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7853,7 +7865,7 @@ msgstr ""
 "controlla la compressione del file principale Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7864,7 +7876,7 @@ msgstr ""
 "per sezione <literal>External-Links</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -7874,7 +7886,7 @@ msgstr ""
 "dall'umask."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7885,12 +7897,12 @@ msgstr ""
 "en</filename> principale."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "Sezione <literal>TreeDefault</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7901,7 +7913,7 @@ msgstr ""
 "$(DIST), $(SECTION) e $(ARCH) verranno sostituite dai loro rispettivi valori."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -7912,7 +7924,7 @@ msgstr ""
 "tutti nel giro di alcuni giorni."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -7931,7 +7943,7 @@ msgstr ""
 "sono espressi in giorni."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7940,7 +7952,7 @@ msgstr ""
 "predefinito è <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7949,7 +7961,7 @@ msgstr ""
 "valore predefinito è <filename>$(DIST)/$(SECTION)/source/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7958,7 +7970,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7967,7 +7979,7 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7978,7 +7990,7 @@ msgstr ""
 "predefinito è <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -7989,7 +8001,7 @@ msgstr ""
 "predefinito è <filename>$(DIST)/$(SECTION)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -8004,12 +8016,12 @@ msgstr ""
 "automaticamente insieme questi file dei pacchetti."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr "Imposta il file di intestazione da anteporre all'output dei contenuti."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8018,7 +8030,7 @@ msgstr ""
 "stesso database può essere condiviso da più sezioni."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8029,7 +8041,7 @@ msgstr ""
 "relativi dei file vengono fatti precedere dalla directory archivio."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8042,12 +8054,12 @@ msgstr ""
 "opzione viene usata quando si elaborano gli indici dei sorgenti."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "Sezione <literal>Tree</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8062,7 +8074,7 @@ msgstr ""
 "<literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -8075,7 +8087,7 @@ msgstr ""
 "è un'impostazione simile a <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8086,7 +8098,7 @@ msgstr ""
 "nuove variabili."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8100,7 +8112,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8111,7 +8123,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8121,7 +8133,7 @@ msgstr ""
 "da spazi; tipicamente è simile a <literal>main contrib non-free</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -8132,7 +8144,7 @@ msgstr ""
 "questo albero ha un archivio sorgente."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8141,7 +8153,7 @@ msgstr ""
 "sulla sezione, la priorità e l'indirizzo del manutentore."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8150,22 +8162,22 @@ msgstr ""
 "sulla sezione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "Imposta il file override binario extra."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "Imposta il file override sorgente extra."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "Sezione <literal>BinDirectory</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8180,12 +8192,12 @@ msgstr ""
 "impostazioni <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "Imposta l'output del file Packages."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8194,42 +8206,42 @@ msgstr ""
 "<literal>Packages</literal> e <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "Imposta l'output del file Contents (opzionale)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "Imposta il file override binario."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "Imposta il file override sorgente."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "Imposta il DB della cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "Aggiunge un percorso a tutti i percorsi di uscita."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "Specifica il file con l'elenco dei file."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "Il file override binario"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8244,19 +8256,19 @@ msgstr ""
 "campo di permutazione del manutentore."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "vecchio [// vecchio...]* => nuovo"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "nuovo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8273,12 +8285,12 @@ msgstr ""
 "seconda forma sostituisce invariabilmente il campo manutentore."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "Il file override sorgente"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8289,12 +8301,12 @@ msgstr ""
 "del pacchetto sorgente, il secondo è la sezione a cui assegnarlo."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "Il file override extra"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8305,7 +8317,7 @@ msgstr ""
 "tag e il resto della riga è il nuovo valore."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8330,7 +8342,7 @@ msgstr ""
 "<literal>SHA256</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8339,7 +8351,7 @@ msgstr ""
 "Voce di configurazione: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -8353,7 +8365,7 @@ msgstr ""
 "configurazione. Voce di configurazione: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -8367,7 +8379,7 @@ msgstr ""
 "FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -8383,7 +8395,7 @@ msgstr ""
 "configurazione: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8394,7 +8406,7 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8403,7 +8415,7 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8417,7 +8429,7 @@ msgstr ""
 "Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8440,7 +8452,7 @@ msgstr ""
 "tutti questi controlli aggiuntivi sono inutili."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8456,13 +8468,13 @@ msgstr ""
 "comando generate."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8471,7 +8483,7 @@ msgstr ""
 "binari (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8479,36 +8491,53 @@ msgstr ""
 "<command>apt-ftparchive</command> restituisce zero in caso di funzionamento "
 "normale e il valore decimale 100 in caso di errore."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "it"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "Guida dell'utente di APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
+
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Questo documento fornisce una panoramica su come usare il gestore di "
 "pacchetti APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8520,8 +8549,8 @@ msgstr ""
 "pubblicata dalla Free Software Foundation, nella versione 2 o (a propria "
 "scelta) qualsiasi versione successiva."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8529,31 +8558,31 @@ msgstr ""
 "Per ulteriori dettagli, sui sistemi Debian, si veda il testo completo della "
 "licenza nel file /usr/share/common-licenses/GPL."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "Descrizione generale"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
 "Il pacchetto APT al momento contiene due sezioni, il metodo APT per "
-"<prgn>dselect</prgn> e l'interfaccia utente a riga di comando <prgn>apt-get</"
-"prgn>; entrambi forniscono un modo per installare e rimuovere pacchetti, "
-"così come per scaricarne di nuovi da Internet."
+"<command>dselect</command> e l'interfaccia utente a riga di comando "
+"<command>apt-get</command>; entrambi forniscono un modo per installare e "
+"rimuovere pacchetti, così come per scaricarne di nuovi da Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Anatomia del sistema dei pacchetti"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8564,8 +8593,8 @@ msgstr ""
 "maniera pulita nel sistema. La sua caratteristica più importante è il "
 "sistema di dipendenze."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8580,8 +8609,8 @@ msgstr ""
 "possibile avere più di una scelta per cose quali i programmi di "
 "trasferimento della posta elettronica, i server X e così via."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8592,8 +8621,8 @@ msgstr ""
 "concetto di dipendenza semplice: un pacchetto richiede che un altro sia "
 "installato insieme ad esso per poter funzionare."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8606,8 +8635,8 @@ msgstr ""
 "che si tratta di un'estensione di emacs, mailcrypt ha anche una dipendenza "
 "semplice da emacs, senza il quale è totalmente inutile."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8628,8 +8657,8 @@ msgstr ""
 "seriamente il sistema, quindi ciascun programma di trasporto della posta ha "
 "una dipendenza di conflitto verso tutti gli altri."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8650,8 +8679,8 @@ msgstr ""
 "dipendere da mail-transport-agent. Quando si cerca di modificare a mano i "
 "pacchetti, questo può portare a moltissima confusione."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8663,77 +8692,84 @@ msgstr ""
 "problemi di dipendenze fornendo svariati algoritmi automatici, che aiutano a "
 "selezionare i pacchetti da installare."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> fornisce un modo semplice di installare i pacchetti "
-"dalla riga di comando. Diversamente da <prgn>dpkg</prgn>, <prgn>apt-get</"
-"prgn> non tratta i file .deb, ma utilizza il vero nome dei pacchetti e può "
-"installare archivi .deb solo da una <em>fonte</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"La prima <footnote><p>Se si sta usando un server proxy http, si deve prima "
-"ancora impostare la variabile d'ambiente http_proxy; vedere sources.list(5)."
-"</p></footnote> cosa da fare prima di usare <prgn>apt-get</prgn> è scaricare "
-"gli elenchi dei pacchetti dalle <em>fonti</em> in modo che il programma "
-"sappia quali pacchetti sono disponibili. Lo si fa con <tt>apt-get update</"
-"tt>. Ad esempio,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> fornisce un modo semplice di installare i "
+"pacchetti dalla riga di comando. Diversamente da <command>dpkg</command>, "
+"<command>apt-get</command> non tratta i file .deb, ma utilizza il vero nome "
+"dei pacchetti e può installare archivi .deb solo da una <emphasis>fonte</"
+"emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Se si sta usando un server proxy http, si deve prima ancora impostare la "
+"variabile d'ambiente http_proxy; vedere sources.list(5)."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"La prima <placeholder type=\"footnote\" id=\"0\"/> cosa da fare prima di "
+"usare <command>apt-get</command> è scaricare gli elenchi dei pacchetti dalle "
+"<emphasis>fonti</emphasis> in modo che il programma sappia quali pacchetti "
+"sono disponibili. Lo si fa con <literal>apt-get update</literal>. Ad esempio,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Scaricamento di: http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Scaricamento di: http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Lettura elenco dei pacchetti... Fatto\n"
-"Generazione albero delle dipendenze... Fatto"
+"Generazione albero delle dipendenze... Fatto\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr "Una volta aggiornato l'elenco, si possono usare svariati comandi:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "Upgrade tenterà di fare un aggiornamento indolore del sistema completo, "
 "senza installare mai nuovi pacchetti o rimuoverne di esistenti, e senza mai "
@@ -8742,15 +8778,15 @@ msgstr ""
 "Upgrade elencherà tutti i pacchetti che non avrà potuto aggiornare, cosa che "
 "in genere significa che questi dipendono da nuovi pacchetti o che vanno in "
 "conflitto con altri. Per forzare la loro installazione si può usare "
-"<prgn>dselect</prgn> o <tt>apt-get install</tt>."
+"<command>dselect</command> o <literal>apt-get install</literal>."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8769,21 +8805,22 @@ msgstr ""
 "devono essere modificati altri pacchetti che non siano quelli sulla riga di "
 "comando."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "Dist-upgrade fa un aggiornamento completo ed è progettato in modo da rendere "
 "semplici gli aggiornamenti tra i rilasci di Debian. Usa un algoritmo "
@@ -8791,12 +8828,12 @@ msgstr ""
 "aggiornare e rimuovere per migrare alla versione più recente la maggior "
 "parte del sistema possibile. In alcune situazioni può essere vantaggioso "
 "usare dist-upgrade invece di dedicare tempo a risolvere manualmente le "
-"dipendenze con <prgn>dselect</prgn>. Una volta completato il lavoro di dist-"
-"upgrade, si può usare <prgn>dselect</prgn> per installare eventuali "
-"pacchetti che sono stati tralasciati."
+"dipendenze con <command>dselect</command>. Una volta completato il lavoro di "
+"dist-upgrade, si può usare <command>dselect</command> per installare "
+"eventuali pacchetti che sono stati tralasciati."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8804,167 +8841,172 @@ msgstr ""
 "È importante controllare attentamente cosa intende fare dist-upgrade, dato "
 "che le sue decisioni a volte possono essere abbastanza sorprendenti."
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
 #, 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 "
-#| "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 "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed 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 used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> ha diverse opzioni per la riga di comando, che sono "
-"documentate dettagliatamente nella sua pagina di manuale, <manref section="
-"\"8\" name=\"apt-get\">. L'opzione più utile è <tt>-d</tt>, che non installa "
-"i file scaricati; se il sistema deve scaricare un gran numero di pacchetti, "
-"non è bene iniziare ad installarli nel caso qualcosa dovesse andare storto. "
-"Quando si usa <tt>-d</tt>, gli archivi scaricati possono essere installati "
-"semplicemente eseguendo di nuovo lo stesso comando senza l'opzione <tt>-d</"
-"tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#| "<command>apt-get</command> has several command line options that are "
+#| "detailed in its man page, <manref section=\"8\" name=\"apt-get\">. The "
+#| "most useful option is <literal>-d</literal> 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 <literal>-d</literal> is used the downloaded archives can be "
+#| "installed by simply running the command that caused them to be downloaded "
+#| "again without <literal>-d</literal>."
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> 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 <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> ha diverse opzioni per la riga di comando, che "
+"sono documentate dettagliatamente nella sua pagina di manuale, <manref "
+"section=\"8\" name=\"apt-get\">. L'opzione più utile è <literal>-d</"
+"literal>, che non installa i file scaricati; se il sistema deve scaricare un "
+"gran numero di pacchetti, non è bene iniziare ad installarli nel caso "
+"qualcosa dovesse andare storto. Quando si usa <literal>-d</literal>, gli "
+"archivi scaricati possono essere installati semplicemente eseguendo di nuovo "
+"lo stesso comando senza l'opzione <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"Il metodo APT di <prgn>dselect</prgn> fornisce tutte le funzionalità del "
-"sistema APT con l'interfaccia grafica di selezione dei pacchetti "
-"<prgn>dselect</prgn>. <prgn>dselect</prgn> viene usato per selezionare i "
-"pacchetti da installare o rimuovere, ed APT fa l'effettiva installazione."
+"Il metodo APT di <command>dselect</command> fornisce tutte le funzionalità "
+"del sistema APT con l'interfaccia grafica di selezione dei pacchetti "
+"<command>dselect</command>. <command>dselect</command> viene usato per "
+"selezionare i pacchetti da installare o rimuovere, ed APT fa l'effettiva "
+"installazione."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
-"Per abilitare il metodo APT si deve selezionare [A]ccess in <prgn>dselect</"
-"prgn> e scegliere il metodo APT; verrà chiesto un insieme di fonti "
-"(<em>Sources</em>), cioè di posti da cui scaricare gli archivi. Possono "
-"essere siti Internet remoti, mirror locali di Debian o CD-ROM; ogni fonte "
-"può fornire una parte dell'intero archivio Debian, ed APT le combinerà "
-"automaticamente insieme per formare un insieme completo di pacchetti. Se si "
-"ha un CD-ROM allora è una buona idea indicarlo per primo e poi specificare "
-"un mirror, in modo da avere accesso alle ultime versioni con le soluzioni "
-"dei bug. APT in questo modo userà automaticamente i pacchetti sul CD-ROM "
-"prima di scaricarli da Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"Per abilitare il metodo APT si deve selezionare [A]ccess in "
+"<command>dselect</command> e scegliere il metodo APT; verrà chiesto un "
+"insieme di fonti (<emphasis>Sources</emphasis>), cioè di posti da cui "
+"scaricare gli archivi. Possono essere siti Internet remoti, mirror locali di "
+"Debian o CD-ROM; ogni fonte può fornire una parte dell'intero archivio "
+"Debian, ed APT le combinerà automaticamente insieme per formare un insieme "
+"completo di pacchetti. Se si ha un CD-ROM allora è una buona idea indicarlo "
+"per primo e poi specificare un mirror, in modo da avere accesso alle ultime "
+"versioni con le soluzioni dei bug. APT in questo modo userà automaticamente "
+"i pacchetti sul CD-ROM prima di scaricarli da Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"La configurazione delle <em>fonti</em> inizia chiedendo la base "
+"La configurazione delle <emphasis>fonti</emphasis> inizia chiedendo la base "
 "dell'archivio Debian, proponendo in modo predefinito un mirror HTTP; "
 "successivamente viene chiesta la distribuzione da scaricare."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"La distribuzione indica la versione Debian dell'archivio: <em>stable</em> è "
-"l'ultima versione rilasciata e <em>unstable</em> è quella di sviluppo. "
-"<em>non-US</em> è disponibile solo su alcuni mirror e contiene dei pacchetti "
-"in cui viene usata della tecnologia di cifratura o altre cose che non "
-"possono essere esportate dagli Stati Uniti; importare questi pacchetti negli "
-"USA è però legale."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"La distribuzione indica la versione Debian dell'archivio: <emphasis>stable</"
+"emphasis> è l'ultima versione rilasciata e <emphasis>unstable</emphasis> è "
+"quella di sviluppo. <emphasis>non-US</emphasis> è disponibile solo su alcuni "
+"mirror e contiene dei pacchetti in cui viene usata della tecnologia di "
+"cifratura o altre cose che non possono essere esportate dagli Stati Uniti; "
+"importare questi pacchetti negli USA è però legale."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8977,8 +9019,8 @@ msgstr ""
 "mentre contrib e non-free contengono software che ha diverse restrizioni "
 "sull'uso e sulla distribuzione."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -8987,23 +9029,24 @@ msgstr ""
 "configurazione continuerà a chiedere fino a che non sono state specificate "
 "tutte quelle desiderate."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Prima di cominciare a usare <prgn>dselect</prgn> è necessario aggiornare "
-"l'elenco dei pacchetti disponibili selezionando [U]pdate dal menù: si tratta "
-"di un sovrainsieme di ciò che fa <tt>apt-get update</tt>, che rende le "
-"informazioni scaricate disponibili a <prgn>dselect</prgn>. [U]pdate deve "
-"essere usato anche se prima è stato eseguito <tt>apt-get update</tt>."
+"Prima di cominciare a usare <command>dselect</command> è necessario "
+"aggiornare l'elenco dei pacchetti disponibili selezionando [U]pdate dal "
+"menù: si tratta di un sovrainsieme di ciò che fa <literal>apt-get update</"
+"literal>, che rende le informazioni scaricate disponibili a "
+"<command>dselect</command>. [U]pdate deve essere usato anche se prima è "
+"stato eseguito <literal>apt-get update</literal>."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9015,77 +9058,94 @@ msgstr ""
 "[C]onfig e [R]emove non hanno significato, dato che entrambe le fasi sono "
 "contenute in [I]nstall."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "In modo predefinito APT rimuoverà automaticamente i file (.deb) dei "
 "pacchetti che sono stati installati con successo. Per modificare questo "
-"comportamento, inserire <tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt."
-"conf."
+"comportamento, inserire <literal>Dselect::clean \"prompt\";</literal> in /"
+"etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "L'interfaccia"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
+#, fuzzy
+#| msgid ""
+#| "Both that APT <command>dselect</command> method and <command>apt-get</"
+#| "command> share the same interface. It is a simple system that generally "
+#| "tells you what it will do and then goes and does it. <footnote><para>The "
+#| "<command>dselect</command> method actually is a set of wrapper scripts to "
+#| "<command>apt-get</command>. The method actually provides more "
+#| "functionality than is present in <command>apt-get</command> alone.</"
+#| "para></footnote> After printing out a summary of what will happen APT "
+#| "then will print out some informative status messages so that you can "
+#| "estimate how far along it is and how much is left to do."
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Sia il metodo APT per <prgn>dselect</prgn> sia <prgn>apt-get</prgn> "
-"condividono la stessa interfaccia; si tratta di un sistema semplice che "
-"indica in genere cosa sta per fare, e poi lo fa. <footnote><p>Il metodo "
-"<prgn>dselect</prgn> è in realtà un insieme di script di wrapper per "
-"<prgn>apt-get</prgn>. Il metodo di fatto fornisce delle funzionalità "
-"maggiori del solo <prgn>apt-get</prgn>.</p></footnote> Dopo la stampa di un "
-"riassunto delle operazioni che saranno fatte, APT stampa dei messaggi "
-"informativi sullo stato, in modo da poter avere un'idea del punto a cui "
-"arrivato e di quanto ci sia ancora da fare."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Sia il metodo APT per <command>dselect</command> sia <command>apt-get</"
+"command> condividono la stessa interfaccia; si tratta di un sistema semplice "
+"che indica in genere cosa sta per fare, e poi lo fa. <footnote><para>Il "
+"metodo <command>dselect</command> è in realtà un insieme di script di "
+"wrapper per <command>apt-get</command>. Il metodo di fatto fornisce delle "
+"funzionalità maggiori del solo <command>apt-get</command>.</para></footnote> "
+"Dopo la stampa di un riassunto delle operazioni che saranno fatte, APT "
+"stampa dei messaggi informativi sullo stato, in modo da poter avere un'idea "
+"del punto a cui arrivato e di quanto ci sia ancora da fare."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Avvio"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Prima di ogni operazione, eccetto update, APT compie alcune operazioni per "
 "preparare il suo stato interno; fa inoltre dei controlli sullo stato del "
 "sistema. In qualsiasi momento le stesse operazioni possono essere fatte con "
-"<tt>apt-get check</tt>."
+"<literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Lettura elenco pacchetti... Fatto\n"
-"Generazione albero delle dipendenze... Fatto"
+"Generazione albero delle dipendenze... Fatto\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9098,22 +9158,22 @@ msgstr ""
 "trovati, sono ignorati e viene stampato un avvertimento all'uscita di apt-"
 "get."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "L'operazione finale consiste in un'analisi dettagliata delle dipendenze del "
 "sistema: viene controllato che tutte le dipendenze dei singoli pacchetti "
 "installati o non scompattati siano soddisfatte. Se vengono individuati dei "
-"problemi, viene stampato un resoconto, e <prgn>apt-get</prgn> esce senza "
-"eseguire alcuna operazione."
+"problemi, viene stampato un resoconto, e <command>apt-get</command> esce "
+"senza eseguire alcuna operazione."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9123,14 +9183,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Lettura elenco pacchetti... Fatto\n"
@@ -9139,17 +9199,17 @@ msgstr ""
 "I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
 "  9fonts: Dipende: xlib6g ma non è installato\n"
 "  uucp: Dipende: mailx ma non è installato\n"
-"  blast: Dipende: xlib6g (>= 3.3-5) ma non è installato\n"
+"  blast: Dipende: xlib6g (&gt;= 3.3-5) ma non è installato\n"
 "  adduser: Dipende: perl-base ma non è installato\n"
 "  aumix: Dipende: libgpmg1 ma non è installato\n"
 "  debiandoc-sgml: Dipende: sgml-base ma non è installato\n"
-"  bash-builtins: Dipende: bash (>= 2.01) ma la versione 2.0-3 è installata\n"
+"  bash-builtins: Dipende: bash (&gt;= 2.01) ma la versione 2.0-3 è installata\n"
 "  cthugha: Dipende: svgalibg1 ma non è installato\n"
-"           Dipende: xlib6g (>= 3.3-5) ma non è installato\n"
-"  libreadlineg2: Va in conflitto: libreadline2 (<< 2.1-2.1)"
+"           Dipende: xlib6g (&gt;= 3.3-5) ma non è installato\n"
+"  libreadlineg2: Va in conflitto: libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9163,86 +9223,105 @@ msgstr ""
 "dipendenze non sono soddisfatte. Viene inclusa inoltre una breve spiegazione "
 "del perché il pacchetto ha un problema di dipendenze."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
+#, fuzzy
+#| msgid ""
+#| "There are two ways a system can get into a broken state like this. The "
+#| "first is caused by <command>dpkg</command> missing some subtle "
+#| "relationships between packages when performing upgrades. "
+#| "<footnote><para>APT however considers all known dependencies and attempts "
+#| "to prevent broken packages</para></footnote>. The second is if a package "
+#| "installation fails during an operation. In this situation a package may "
+#| "have been unpacked without its dependents being installed."
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Ci sono due modi in cui un sistema può arrivare in uno stato problematico di "
-"questo genere: il primo avviene se <prgn>dpkg</prgn> non ha ravvisato alcune "
-"relazioni delicate tra i pacchetti durante un aggiornamento. "
-"<footnote><p>APT invece considera tutte le dipendenze note e cerca di "
-"evitare la presenza di pacchetti difettosi.</p></footnote> Il secondo è "
+"questo genere: il primo avviene se <command>dpkg</command> non ha ravvisato "
+"alcune relazioni delicate tra i pacchetti durante un aggiornamento. "
+"<footnote><para>APT invece considera tutte le dipendenze note e cerca di "
+"evitare la presenza di pacchetti difettosi.</para></footnote> Il secondo è "
 "possibile se l'installazione di un pacchetto fallisce; in questo caso è "
 "possibile che un pacchetto venga scompattato senza che tutti quelli da cui "
 "dipende siano stati installati."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "La seconda situazione è molto meno seria della prima, dato che APT pone "
 "alcune restrizioni sull'ordine di installazione dei pacchetti. In entrambi i "
-"casi l'opzione <tt>-f</tt> di <prgn>apt-get</prgn> farà sì che APT trovi una "
-"soluzione possibile e possa continuare. Il metodo APT di <prgn>dselect</"
-"prgn> comprende sempre l'opzione <tt>-f</tt> per permettere di continuare "
-"facilmente anche in caso di script dei manutentori errati."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Tuttavia, se l'opzione <tt>-f</tt> viene usata per correggere un sistema in "
-"uno stato molto problematico causato da una situazione del primo tipo, è "
-"possibile che l'operazione fallisca subito o che fallisca durante la "
+"casi l'opzione <literal>-f</literal> di <command>apt-get</command> farà sì "
+"che APT trovi una soluzione possibile e possa continuare. Il metodo APT di "
+"<command>dselect</command> comprende sempre l'opzione <literal>-f</literal> "
+"per permettere di continuare facilmente anche in caso di script dei "
+"manutentori errati."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Tuttavia, se l'opzione <literal>-f</literal> viene usata per correggere un "
+"sistema in uno stato molto problematico causato da una situazione del primo "
+"tipo, è possibile che l'operazione fallisca subito o che fallisca durante la "
 "sequenza di installazione. In entrambi i casi è necessario usare dpkg a mano "
 "(probabilmente usando delle opzioni di forzatura) per correggere quanto "
 "basta per poter fare continuare APT."
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "Il resoconto sullo stato"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
-"Prima di procedere, <prgn>apt-get</prgn> presenterà un resoconto delle "
+"Prima di procedere, <command>apt-get</command> presenterà un resoconto delle "
 "operazioni che sta per fare. In genere tale resoconto varierà con il tipo di "
 "operazione da fare, ma ci sono svariati elementi comuni: in tutti i casi gli "
 "elenchi riflettono lo stato finale delle cose, e tengono conto dell'opzione "
-"<tt>-f</tt> e di altre attività rilevanti per il comando da eseguire."
+"<literal>-f</literal> e di altre attività rilevanti per il comando da "
+"eseguire."
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "L'elenco dei pacchetti extra"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9250,86 +9329,87 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "I seguenti pacchetti saranno inoltre installati:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "L'elenco dei pacchetti extra mostra tutti i pacchetti che verranno "
 "installati o aggiornati oltre a quelli indicati sulla riga di comando. Viene "
-"generato solo per il comando <tt>install</tt>. I pacchetti elencati sono "
-"spesso il risultato di un'operazione di installazione automatica."
+"generato solo per il comando <literal>install</literal>. I pacchetti "
+"elencati sono spesso il risultato di un'operazione di installazione "
+"automatica."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "I pacchetti da rimuovere"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "I seguenti pacchetti saranno RIMOSSI:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "L'elenco dei pacchetti da rimuovere indica tutti i pacchetti che verranno "
 "rimossi dal sistema. Può essere mostrato per una qualsiasi delle operazioni, "
 "e deve sempre essere esaminato attentamente per assicurarsi che non venga "
-"eliminato qualcosa di importante. Con l'opzione <tt>-f</tt> è "
+"eliminato qualcosa di importante. Con l'opzione <literal>-f</literal> è "
 "particolarmente probabile che vengano eliminati dei pacchetti, perciò in "
 "questo caso va fatta particolare attenzione. L'elenco può contenere dei "
 "pacchetti che verranno rimossi perché sono solo parzialmente installati, "
 "forse a causa di un'installazione non terminata correttamente."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "L'elenco dei nuovi pacchetti installati"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "I seguenti pacchetti NUOVI saranno installati:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9339,32 +9419,32 @@ msgstr ""
 "quello che accadrà. I pacchetti nell'elenco non sono al momento installati "
 "nel sistema, ma lo saranno alla fine delle operazioni di APT."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "L'elenco dei pacchetti bloccati"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "I seguenti pacchetti sono stati mantenuti alla versione attuale:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "In ogni caso in cui il sistema viene aggiornato nel suo insieme, c'è la "
 "possibilità che non possano venire installate nuove versioni di alcuni "
@@ -9372,26 +9452,27 @@ msgstr ""
 "presenti nel sistema o entrare in conflitto con altri già presenti. In "
 "questo caso, il pacchetto viene elencato nella lista di quelli mantenuti "
 "alla versione attuale. Il miglior modo per forzare l'installazione dei "
-"pacchetti elencati in questa lista è installarli con <tt>apt-get install</"
-"tt> o usare <prgn>dselect</prgn> per risolvere i problemi."
+"pacchetti elencati in questa lista è installarli con <literal>apt-get "
+"install</literal> o usare <command>dselect</command> per risolvere i "
+"problemi."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "Messaggi di avvertimento sui pacchetti bloccati"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "I seguenti pacchetti bloccati saranno cambiati:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9402,32 +9483,32 @@ msgstr ""
 "pacchetto verrà modificato. Questo dovrebbe accadere solo durante operazioni "
 "di dist-upgrade o di install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Resoconto finale"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Infine, APT stamperà un riassunto di tutte le modifiche che accadranno."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 aggiornati, 8 installati, 23 da rimuovere e 51 non aggiornati.\n"
 "12 non completamente installati o rimossi..\n"
-"È necessario scaricare 65.7M/66.7M di archivi. Dopo quest'operazione, verranno occupati 26.5M di spazio su disco."
+"È necessario scaricare 65.7M/66.7M di archivi. Dopo quest'operazione, verranno occupati 26.5M di spazio su disco.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9457,8 +9538,8 @@ msgstr ""
 "in /usr dopo l'installazione. Se si stanno rimuovendo molti pacchetti, "
 "allora il valore può indicare lo spazio che verrà liberato."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9466,13 +9547,13 @@ msgstr ""
 "Si possono generare altri resoconti usando l'opzione -u per mostrare i "
 "pacchetti da aggiornare, ma sono simili all'esempio precedente."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "La visualizzazione dello stato"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9480,8 +9561,8 @@ msgstr ""
 "Durante lo scaricamento degli archivi e dei file dei pacchetti APT stampa "
 "una serie di messaggi di stato."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9490,7 +9571,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Scaricamento di:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9498,129 +9579,127 @@ msgstr ""
 "Trovato http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Scaricamento di:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Scaricamento di:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Le righe che cominciano con <em>Scaricamento di</em> vengono stampate quando "
-"APT inizia a scaricare un file, mentre l'ultima riga indica il progresso "
-"dell'operazione. Il primo valore in percentuale nella riga di progresso "
-"indica la percentuale totale scaricata di tutti i file; dato che la "
-"dimensione dei file Package non è nota, purtroppo a volte <tt>apt-get "
-"update</tt> fa una stima poco accurata."
+"Le righe che cominciano con <emphasis>Scaricamento di</emphasis> vengono "
+"stampate quando APT inizia a scaricare un file, mentre l'ultima riga indica "
+"il progresso dell'operazione. Il primo valore in percentuale nella riga di "
+"progresso indica la percentuale totale scaricata di tutti i file; dato che "
+"la dimensione dei file Package non è nota, purtroppo a volte <literal>apt-"
+"get update</literal> fa una stima poco accurata."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "La sezione successiva della riga di stato viene ripetuta una volta per "
 "ciascuna istanza di scaricamento, ed indica l'operazione in corso, insieme "
 "ad alcune informazioni utili su cosa stia accadendo. A volte questa sezione "
-"contiene solamente <em>Forking</em>, che significa che il sistema operativo "
-"sta caricando il modulo per lo scaricamento. La prima parola dopo la "
-"parentesi quadra aperta è il numero dello scaricamento come mostrato nelle "
-"righe della cronologia. La parola successiva è il nome breve dell'oggetto "
-"che si sta scaricando, che per gli archivi è il nome del pacchetto."
+"contiene solamente <emphasis>Forking</emphasis>, che significa che il "
+"sistema operativo sta caricando il modulo per lo scaricamento. La prima "
+"parola dopo la parentesi quadra aperta è il numero dello scaricamento come "
+"mostrato nelle righe della cronologia. La parola successiva è il nome breve "
+"dell'oggetto che si sta scaricando, che per gli archivi è il nome del "
+"pacchetto."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "All'interno delle virgolette singole c'è una stringa informativa, che indica "
 "il progresso della fase di negoziazione dello scaricamento. Tipicamente "
-"comincia con <em>Connecting</em>, procede con <em>Waiting for file</em> e "
-"poi con <em>Downloading</em> o <em>Resuming</em>; il valore finale è il "
-"numero di byte che sono stati scaricati dal sito remoto. Una volta "
-"cominciato lo scaricamento, viene rappresentato come <tt>102/10.2k</tt>, che "
-"indica che sono stati scaricati 102 byte su 10,2 kilobyte attesi. La "
-"dimensione totale viene sempre espressa in notazione a quattro cifre, per "
-"risparmiare spazio. Dopo la dimensione viene indicato un indicatore "
-"progressivo della percentuale del file. Il penultimo elemento è la velocità "
-"istantanea media, che viene aggiornata ogni 5 secondi e riflette la velocità "
-"di trasferimento dei dati in quel periodo. Infine, viene visualizzato il "
-"tempo stimato per il trasferimento, che viene aggiornato periodicamente e "
-"riflette il tempo necessario per completare tutte le operazioni alla "
-"velocità di trasferimento mostrata."
-
-#. type: <p></p>
-#: guide.sgml:530
+"comincia con <emphasis>Connecting</emphasis>, procede con <emphasis>Waiting "
+"for file</emphasis> e poi con <emphasis>Downloading</emphasis> o "
+"<emphasis>Resuming</emphasis>; il valore finale è il numero di byte che sono "
+"stati scaricati dal sito remoto. Una volta cominciato lo scaricamento, viene "
+"rappresentato come <literal>102/10.2k</literal>, che indica che sono stati "
+"scaricati 102 byte su 10,2 kilobyte attesi. La dimensione totale viene "
+"sempre espressa in notazione a quattro cifre, per risparmiare spazio. Dopo "
+"la dimensione viene indicato un indicatore progressivo della percentuale del "
+"file. Il penultimo elemento è la velocità istantanea media, che viene "
+"aggiornata ogni 5 secondi e riflette la velocità di trasferimento dei dati "
+"in quel periodo. Infine, viene visualizzato il tempo stimato per il "
+"trasferimento, che viene aggiornato periodicamente e riflette il tempo "
+"necessario per completare tutte le operazioni alla velocità di trasferimento "
+"mostrata."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "La visualizzazione dello stato viene aggiornata ogni mezzo secondo per "
 "fornire un feedback costante sul processo di scaricamento, e le righe Get "
 "scorrono in alto quando viene avviato lo scaricamento di un nuovo file. Dato "
 "che la visualizzazione dello stato viene costantemente aggiornata, non è "
 "adatta per essere registrata in un file; per non visualizzarla si può usare "
-"l'opzione <tt>-q</tt>."
+"l'opzione <literal>-q</literal>."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT usa <prgn>dpkg</prgn> per installare gli archivi e passerà "
-"all'interfaccia di <prgn>dpkg</prgn> una volta completati gli scaricamenti. "
-"<prgn>dpkg</prgn> porrà anche alcune domande durante l'elaborazione dei "
-"pacchetti, ed i pacchetti stessi potranno farne altre. Prima di ciascuna "
-"domanda viene proposta di solito una descrizione di ciò che viene chiesto, e "
-"le domande sono troppo diverse per poter essere discusse in maniera completa "
-"in questa occasione."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT usa <command>dpkg</command> per installare gli archivi e passerà "
+"all'interfaccia di <command>dpkg</command> una volta completati gli "
+"scaricamenti. <command>dpkg</command> porrà anche alcune domande durante "
+"l'elaborazione dei pacchetti, ed i pacchetti stessi potranno farne altre. "
+"Prima di ciascuna domanda viene proposta di solito una descrizione di ciò "
+"che viene chiesto, e le domande sono troppo diverse per poter essere "
+"discusse in maniera completa in questa occasione."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "Usare APT offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9629,23 +9708,24 @@ msgstr ""
 "rete, specificatamente un approccio «sfrutta-altra-rete» per fare gli "
 "aggiornamenti."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Introduzione"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Panoramica"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9657,8 +9737,8 @@ msgstr ""
 "ha un collegamento lento, come un modem, e un'altra macchina ha una "
 "connessione veloce, ma le due sono fisicamente distanti."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9666,9 +9746,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "La soluzione è usare supporti rimovibili grandi come un disco Zip o uno "
 "SuperDisk. Questi dischi non sono grandi abbastanza per memorizzare l'intero "
@@ -9678,12 +9758,12 @@ msgstr ""
 "nel disco usando un'altra macchina con una buona connettività. È possibile "
 "anche usare un'altra macchina Debian con APT o usare un sistema operativo "
 "completamente diverso e uno strumento per scaricare file come wget. In "
-"questo documento con <em>host remoto</em> viene indicata la macchina che "
-"scarica i pacchetti, e <em>host di destinazione</em> è quella senza "
-"connessione o con una connessione non buona."
+"questo documento con <emphasis>host remoto</emphasis> viene indicata la "
+"macchina che scarica i pacchetti, e <emphasis>host di destinazione</"
+"emphasis> è quella senza connessione o con una connessione non buona."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9696,13 +9776,13 @@ msgstr ""
 "essere formattato con un file system che può gestire i nomi di file lunghi, "
 "come ext2, fat32 o vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "Usare APT su entrambe le macchine"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9715,8 +9795,8 @@ msgstr ""
 "per decidere quali pacchetti scaricare. La struttura delle directory sul "
 "disco deve essere simile a:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9726,7 +9806,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9735,42 +9815,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "Il file di configurazione"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Il file di configurazione deve indicare ad APT di memorizzare i suoi file "
 "sul disco e di usare i file di configurazione anch'essi sul disco. Il file "
 "sources.list deve contenere i siti appropriati che si desiderano usare dalla "
-"macchina remota e il file di stato dovrebbe essere una copia di <em>/var/lib/"
-"dpkg/status</em> della <em>macchina di destinazione</em>. Notare che, se si "
-"sta usando un archivio locale, si devono usare URI «copy» la cui sintassi è "
-"identica a quella degli URI «file»."
+"macchina remota e il file di stato dovrebbe essere una copia di <emphasis>/"
+"var/lib/dpkg/status</emphasis> della <emphasis>macchina di destinazione</"
+"emphasis>. Notare che, se si sta usando un archivio locale, si devono usare "
+"URI «copy» la cui sintassi è identica a quella degli URI «file»."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> deve contenere le informazioni necessarie per far sì che "
-"APT usi il disco:"
+"<emphasis>apt.conf</emphasis> deve contenere le informazioni necessarie per "
+"far sì che APT usi il disco:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9778,10 +9859,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9792,20 +9873,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Questo non è necessario se le due macchine hanno la stessa architettura,\n"
 "      dice ad APT remoto qual è l'architettura della macchina di destinazione */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Usa il disco per le informazioni sullo stato e ridirige il file di stato\n"
@@ -9816,67 +9897,70 @@ msgstr ""
 "   // Le cache binarie saranno memorizzate in locale\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Posizione dell'elenco di fonti.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Si possono vedere informazioni più dettagliate nella pagina di manuale di "
-"apt.conf e nel file di configurazione d'esempio in <em>/usr/share/doc/apt/"
-"examples/apt.conf</em>."
+"apt.conf e nel file di configurazione d'esempio in <emphasis>/usr/share/doc/"
+"apt/examples/apt.conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Nella macchina di destinazione, la prima cosa da fare è montare il disco e "
-"copiarvi <em>/var/lib/dpkg/status</em>. Sarà anche necessario creare le "
-"directory elencate nella panoramica: <em>archives/partial/</em> e <em>lists/"
-"partial/</em>. Poi portare il disco nella macchina remota e configurare il "
-"file sources.list; in tale macchina eseguire:"
+"copiarvi <emphasis>/var/lib/dpkg/status</emphasis>. Sarà anche necessario "
+"creare le directory elencate nella panoramica: <emphasis>archives/partial/</"
+"emphasis> e <emphasis>lists/partial/</emphasis>. Poi portare il disco nella "
+"macchina remota e configurare il file sources.list; in tale macchina "
+"eseguire:"
 
-#. type: <example></example>
-#: offline.sgml:142
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT scarica i file degli elenchi dei pacchetti ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT scarica tutti i pacchetti necessari per aggiornare la macchina di destinazione ]"
+" [ APT scarica tutti i pacchetti necessari per aggiornare la macchina di destinazione ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Il comando dist-upgrade può essere sostituito con qualsiasi altro comando "
 "APT standard, in particolare dselect-upgrade. Si può persino usare un "
-"frontend per APT come <em>dselect</em>; questo tuttavia pone alcuni problemi "
-"nel comunicare le selezioni fatte al computer locale."
+"frontend per APT come <emphasis>dselect</emphasis>; questo tuttavia pone "
+"alcuni problemi nel comunicare le selezioni fatte al computer locale."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9885,24 +9969,24 @@ msgstr ""
 "la macchina di destinazione. Riportare il disco alla macchina locale ed "
 "eseguire:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT genera una copia locale dei file di cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ O qualsiasi altro comando APT ]"
+"  [ O qualsiasi altro comando APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9910,8 +9994,8 @@ msgstr ""
 "Per il corretto funzionamento è necessario rispecificare il fatto che il "
 "file di stato è quello locale. Questo è molto importante!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9925,25 +10009,25 @@ msgstr ""
 "solamente nella macchina locale, ma ciò non è sempre possibile. NON copiare "
 "il file di stato se nel frattempo sono stati eseguiti dpkg o APT!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "Usare APT e wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> è uno strumento popolare e portabile per scaricare file che "
-"può essere eseguito quasi su qualsiasi macchina. A differenza del metodo "
-"descritto sopra, questo richiede che la macchina Debian abbia già un elenco "
-"dei pacchetti disponibili."
+"<emphasis>wget</emphasis> è uno strumento popolare e portabile per scaricare "
+"file che può essere eseguito quasi su qualsiasi macchina. A differenza del "
+"metodo descritto sopra, questo richiede che la macchina Debian abbia già un "
+"elenco dei pacchetti disponibili."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9955,13 +10039,13 @@ msgstr ""
 "print-uris di apt-get e poi preparando uno script che usa wget per scaricare "
 "effettivamente i pacchetti."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Funzionamento"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9970,22 +10054,22 @@ msgstr ""
 "configurazione speciali; vengono semplicemente usati i comandi APT standard "
 "per generare l'elenco dei file."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Inserire no alla domanda, assicurarsi di approvare le azioni proposte ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -9993,8 +10077,8 @@ msgstr ""
 "Si può usare qualsiasi comando che non sia dist-upgrade, incluso dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10006,25 +10090,25 @@ msgstr ""
 "essere eseguito con il punto di mount del disco come directory attuale di "
 "lavoro, in modo che l'output venga salvato sul disco."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "Nella macchina remota fare qualcosa come:"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ attendere... ]"
+"  [ attendere... ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10032,14 +10116,14 @@ msgstr ""
 "Una volta che gli archivi sono stati scaricati e il disco è stato riportato "
 "alla macchina Debian, si può procedere con l'installazione usando"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
@@ -10140,9 +10224,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ msgid "FILES"
 #~ msgstr "FILE"
 
-#~ msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-#~ msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
 #~ msgid ""
 #~ "<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!"
 #~ "ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex "
@@ -11572,22 +11653,24 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #, fuzzy
 #~ msgid ""
-#~ "To enable the APT method you need to select [A]ccess in <prgn>dselect</"
-#~ "prgn> and then choose the APT method. You will be prompted for a set of "
-#~ "<em>Sources</em> which are places to fetch archives from. These can be "
-#~ "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
-#~ "provide a fragment of the total Debian archive, APT will automatically "
-#~ "combine them to form a complete set of packages. If you have a CDROM then "
-#~ "it is a good idea to specify it first and then specify a mirror so that "
-#~ "you have access to the latest bug fixes. APT will automatically use "
-#~ "packages on your CDROM before downloading from the Internet."
+#~ "To enable the APT method you need to select [A]ccess in <command>dselect</"
+#~ "command> and then choose the APT method. You will be prompted for a set "
+#~ "of <emphasis>Sources</emphasis> which are places to fetch archives from. "
+#~ "These can be remote Internet sites, local Debian mirrors or CDROMs. Each "
+#~ "source can provide a fragment of the total Debian archive, APT will "
+#~ "automatically combine them to form a complete set of packages. If you "
+#~ "have a CDROM then it is a good idea to specify it first and then specify "
+#~ "a mirror so that you have access to the latest bug fixes. APT will "
+#~ "automatically use packages on your CDROM before downloading from the "
+#~ "Internet."
 #~ msgstr ""
-#~ "Per abilitare il metodo APT dovete selezionare [A]ccess in <prgn>dselect</"
-#~ "prgn> e scegliere il metodo APT; vi verrà chiesto un insieme di fonti "
-#~ "(<em>Sources</em>), cioè di posti da cui scaricare gli archivi. Tali "
-#~ "fonti possono essere siti Internet remoti, mirror locali di Debian o "
-#~ "CDROM; ciascuna di esse può fornire una parte dell'archivio Debian, ed "
-#~ "APT le combinerà insieme in un set completo di pacchetti. Se avete un "
-#~ "CDROM è una buona idea indicare quello per primo, e poi i mirror, in modo "
-#~ "da avere accesso alle ultime versioni; APT userà in questo modo "
-#~ "automaticamente i pacchetti sul CDROM prima di scaricarli da Internet."
+#~ "Per abilitare il metodo APT dovete selezionare [A]ccess in "
+#~ "<command>dselect</command> e scegliere il metodo APT; vi verrà chiesto un "
+#~ "insieme di fonti (<emphasis>Sources</emphasis>), cioè di posti da cui "
+#~ "scaricare gli archivi. Tali fonti possono essere siti Internet remoti, "
+#~ "mirror locali di Debian o CDROM; ciascuna di esse può fornire una parte "
+#~ "dell'archivio Debian, ed APT le combinerà insieme in un set completo di "
+#~ "pacchetti. Se avete un CDROM è una buona idea indicare quello per primo, "
+#~ "e poi i mirror, in modo da avere accesso alle ultime versioni; APT userà "
+#~ "in questo modo automaticamente i pacchetti sul CDROM prima di scaricarli "
+#~ "da Internet."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 4185c0bfc..0a2984d96 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,13 +6,13 @@
 # KURASAWA Nozomu, 2003-2006, 2009-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.7.25.3\n"
+"Project-Id-Version: apt 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-10 19:52+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
-"Language: \n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -657,81 +657,90 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: 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
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: 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
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
-msgstr ""
+msgstr "コマンドラインインターフェイス"
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "説明"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 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 ""
+"<command>apt</command> (Advanced Package Tool�高度パッケージツール) �パッ"
+"ケージ処�用�コマンドラインツール��。システム�パッケージ管�用コマンドラ"
+"インインターフェイスを�供���。�ら�る低レベルコマンドオプション����"
+"� &apt-get; �� &apt-cache; も�照������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 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 ""
+"パッケージ一覧を表示�る�� <literal>list</literal> を使���。パッケージ�"
+"�マッ�ング�シェルパターン����オプション <option>--installed</"
+"option>� <option>--upgradable</option>� <option>--all-versions</option> を"
+"サ�ート�����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
+"<literal>search</literal> ��指定��語を検索��該当�るパッケージを表示�"
+"��。"
 
 #. 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."
+#: apt.8.xml:60
 msgid ""
 "<literal>show</literal> shows the package information for the given "
 "package(s)."
 msgstr ""
-"<literal>rdepends</literal> ��パッケージ���被�存関係を一覧表示���。"
+"<literal>show</literal> ��指定��パッケージ�����パッケージ情報を表示"
+"���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
+"<literal>install</literal> �続��インストールやアップグレード���パッケー"
+"ジ���を指定���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -748,7 +757,7 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -763,56 +772,67 @@ msgstr ""
 "トール���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
+"<literal>edit-sources</literal> �� sources.list ファイルを編集���基礎的"
+"��全性確�を行���。"
 
 #. 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."
+#: apt.8.xml:95
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources."
 msgstr ""
-"<literal>showhold</literal> ��他� show コマンド��様���留�れ��る"
-"パッケージを出力���。"
+"<literal>update</literal> を使��パッケージ索引ファイルを�れ�れ�ソース�"
+"��期���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
+#, fuzzy
+#| 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."
 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."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
+"<literal>upgrade</literal> を使��システム��在インストール�れ��る全パッ"
+"ケージ�最新版を <filename>/etc/apt/sources.list</filename> �記載�れ��る"
+"ソース�らインストール���。新��パッケージ�インストール�れ���既存�"
+"パッケージ�削除�れる����り��ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 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 ""
+"<literal>full-upgrade</literal> �アップグレード�機能を実行�����パッ"
+"ケージ���を解決�る���必���れ�インストール�れ��るパッケージ�削"
+"除も行���。"
 
 #. 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
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
-msgstr ""
+msgstr "スクリプト��利用"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 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 "
@@ -820,107 +840,98 @@ msgid ""
 "&apt-cache; and &apt-get; via APT options. Please prefer using these "
 "commands in your scripts."
 msgstr ""
+"&apt; コマンドライン�エンドユーザ��ツール���設計�れ��り�出力��ー"
+"ジョン間�変更�れる�能性��り��。後方互�性を��������よ���努"
+"��������証��り��ん。&apt; �機能�全�APTオプションを経由�� "
+"&apt-cache; や &apt-get; �利用�能��。スクリプト���コマンド�利用を�択"
+"�るよ��������。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "&apt-get; ����"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 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 ""
+"<command>apt</command> コマンド�エンドユーザ����使�や��よ���図��"
+"作られ��る�� &apt-get; �よ��後方互�性�必��も�る���り��ん。�"
+"�����一部�オプション�異�る点��り��:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
+#: apt.8.xml:147
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "<literal>Package:</literal> 行"
+msgstr ""
+"オプション <literal>DPkg::Progress-Fancy</literal> �有効�������。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
+#: apt.8.xml:151
 msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "<literal>Component:</literal> 行"
+msgstr "オプション <literal>APT::Color</literal> �有効�������。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
+"新�� <literal>list</literal> コマンド� <literal>dpkg --list</literal> ��"
+"�よ��利用����。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+#: apt.8.xml:160
 msgid ""
 "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
 "enabled by default."
-msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
+msgstr ""
+"オプション <literal>upgrade</literal> �� <literal>--with-new-pkgs</"
+"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
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 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."
+#: apt.8.xml:171
 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"
+"&apt-get;� &apt-cache;� &sources-list;� &apt-conf;� &apt-config;� "
+"&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
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 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."
+#: apt.8.xml:177
 msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
-"<command>apt-get</command> �正常終了時� 0 を返���。エラー時���進� "
-"100 を返���。"
+"<command>apt</command> �正常終了時� 0 を返���。エラー時���進� 100 を"
+"返���。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr "APT パッケージ�作ユーティリティ -- コマンドラインインターフェース"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
-#, 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;."
+#: apt-get.8.xml:35
 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 "
@@ -929,12 +940,12 @@ msgid ""
 msgstr ""
 "<command>apt-get</command> ��パッケージを�作�るコマンドラインツール��"
 "APT ライブラリを用�る他�ツール�ユーザ�「�ックエンド����るも���。"
-"「フロントエンド�インターフェース���&dselect;, &aptitude;, &synaptic;, "
-"&wajig; ����り��。"
+"「フロントエンド�インターフェース���&aptitude;, &synaptic;, &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
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -943,7 +954,7 @@ msgstr ""
 "下�挙�るコマンド�必���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -965,7 +976,7 @@ msgstr ""
 "�サイズを知る����������全体�進�メータ�正��表示�れ��ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -989,7 +1000,7 @@ msgstr ""
 "ケージ�新���ージョン��る��を知ら�る必���り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1013,7 +1024,7 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1030,7 +1041,7 @@ msgstr ""
 "�)"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -1058,7 +1069,7 @@ msgstr ""
 "断を上書��る��利用�れる�能性��り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1067,7 +1078,7 @@ msgstr ""
 "�り��ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -1086,7 +1097,7 @@ msgstr ""
 "�るパッケージ) をダウンロード・インストール���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1095,7 +1106,7 @@ msgstr ""
 "リシーを作�����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -1112,7 +1123,7 @@ msgstr ""
 "��'^' や '$' を付�る��も��詳��正�表�を指定������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1122,7 +1133,7 @@ msgstr ""
 "<literal>purge</literal> � <literal>remove</literal> �����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1141,7 +1152,7 @@ msgstr ""
 "literal> 構文�指定���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1155,7 +1166,7 @@ msgstr ""
 "��・新����) ソース�ージョンを�得��り�何も�得�����り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1170,7 +1181,7 @@ msgstr ""
 "ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -1184,7 +1195,7 @@ msgstr ""
 "�ージョン�厳密�一致������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1195,7 +1206,7 @@ msgstr ""
 "ソース� tarball �よ�����カレントディレクトリ�ダウンロード���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1210,7 +1221,7 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1219,7 +1230,7 @@ msgstr ""
 "�ェック�る診断ツール��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1228,16 +1239,7 @@ 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."
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1246,13 +1248,10 @@ msgid ""
 msgstr ""
 "<literal>clean</literal> ���得��パッケージ�ローカルリ�ジトリを掃除��"
 "�。<filename>&cachedir;/archives/</filename> � <filename>&cachedir;/"
-"archives/partial/</filename> �らロックファイル以外���削除���。APT � "
-"&dselect; �ら呼�れる�����自動的� <literal>clean</literal> �実行�れ"
-"��。dselectを使用���場���ディスクスペースを解放�る���時々 "
-"<literal>apt-get clean</literal> を実行����る��ょ�。"
+"archives/partial/</filename> �らロックファイル以外���削除���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1271,7 +1270,7 @@ msgstr ""
 "防���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1281,7 +1280,7 @@ msgstr ""
 "的�インストール�れ�も�必������パッケージを削除�る��使用���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1303,7 +1302,7 @@ msgstr ""
 "option> コマンド���オプションを使用����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1312,7 +1311,7 @@ msgstr ""
 "<literal>APT::Install-Recommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1321,7 +1320,7 @@ msgstr ""
 "<literal>APT::Install-Suggests</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1330,20 +1329,7 @@ msgstr ""
 "���ん。設定項目: <literal>APT::Get::Download-Only</literal>"
 
 #. 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>."
+#: apt-get.8.xml:271
 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 "
@@ -1363,13 +1349,13 @@ msgstr ""
 "体��システム�存在�る破���パッケージ�存関係を許�����������"
 "��� APT を実行�る場����オプション�必���る����り��。システム"
 "��存関係構造���り�題��る場���手動�修正�るよ��求�る��も�り"
-"��。(通常���題��るパッケージを�り除��� &dselect; や <command>dpkg "
-"--remove</command> を使用���) ��オプションを <option>-m</option> オプ"
-"ション��時�使用�る��エラー��る状���る�も�れ��ん。設定項目: "
-"<literal>APT::Get::Fix-Broken</literal>"
+"��。(通常���題��るパッケージを�り除��� <command>dpkg --remove</"
+"command> を使用���) ��オプションを <option>-m</option> オプション��時"
+"�使用�る��エラー��る状���る�も�れ��ん。設定項目: <literal>APT::"
+"Get::Fix-Broken</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1388,7 +1374,7 @@ msgstr ""
 "Get::Fix-Missing</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1399,7 +1385,7 @@ msgstr ""
 "�よ���ょ�。設定項目: <literal>APT::Get::Download</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1418,7 +1404,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1428,7 +1414,7 @@ msgstr ""
 "行���ん。設定項目: <literal>APT::Get::Simulate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1446,7 +1432,7 @@ msgstr ""
 "�よる警告�����も�何を���る��知�����れ��り��ん)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1460,7 +1446,7 @@ msgstr ""
 "れ�) 空�角カッコ�大���題������を表���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1474,7 +1460,7 @@ msgstr ""
 "定項目: <literal>APT::Get::Assume-Yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1483,7 +1469,7 @@ msgstr ""
 "Assume-No</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1492,7 +1478,7 @@ msgstr ""
 "<literal>APT::Get::Show-Upgraded</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1501,15 +1487,7 @@ msgstr ""
 "<literal>APT::Get::Show-Versions</literal>"
 
 #. 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>"
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1522,18 +1500,10 @@ msgstr ""
 "ケージ�アーキテク�ャや���よ��クロス�存関係を解決�る�を制御���。"
 "デフォルト��未定義���れ�ホストアーキテク�ャ��(<literal>APT::"
 "Architecture</literal> �定義��) ビルドアーキテク�ャ�������味��り"
-"��。設定項目: <literal>APT::Get::Host-Architecture</literal>"
+"��。設定項目: <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>"
+#: apt-get.8.xml:374
 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 "
@@ -1541,14 +1511,14 @@ msgid ""
 "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>"
+"��オプション��<command>apt-get source --compile</command> �パッケージを"
+"ビルド�る際�有効化�るビルドプロファイルや���よ��クロス�存関係を解決"
+"�る�を制御���。デフォルト��有効化�るビルドプロファイル��り��ん。"
+"コンマ�連��る���複数�ビルドプロファイルを有効化����。設定項目: "
+"<literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1557,7 +1527,7 @@ msgstr ""
 "Get::Compile</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1570,7 +1540,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1580,9 +1550,16 @@ msgid ""
 "will never remove packages, only allow adding new ones.  Configuration Item: "
 "<literal>APT::Get::Upgrade-Allow-New</literal>."
 msgstr ""
+"<literal>upgrade</literal> �併��使��場��新��パッケージ�インストール"
+"を許����。�れ�新���存をインストール�る���既�インストール�れ�"
+"�るパッケージを更新�る必���る場��有用��。パッケージを�留�る代�り"
+"� <literal>upgrade</literal> �パッケージをアップグレード��新���存をイ"
+"ンストール���。��オプション�併��使��場��<literal>upgrade</"
+"literal> �パッケージを削除�る������新�追加を許��る����る���"
+"注�������。設定項目: <literal>APT::Get::Upgrade-Allow-New</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1595,7 +1572,7 @@ msgstr ""
 "Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1608,7 +1585,7 @@ msgstr ""
 "定項目: <literal>APT::Get::Only-Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1622,7 +1599,7 @@ msgstr ""
 "ん! 設定項目: <literal>APT::Get::force-yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1643,7 +1620,7 @@ msgstr ""
 "Print-URIs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 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. "
@@ -1656,7 +1633,7 @@ msgstr ""
 "<literal>APT::Get::Purge</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1665,7 +1642,7 @@ msgstr ""
 "定項目: <literal>APT::Get::ReInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 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 "
@@ -1681,7 +1658,7 @@ msgstr ""
 "�る時�ら���ょ�。設定項目: <literal>APT::Get::List-Cleanup</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1704,7 +1681,7 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1717,7 +1694,7 @@ msgstr ""
 "ç›®: <literal>APT::Get::Trivial-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1726,7 +1703,7 @@ msgstr ""
 "é …ç›®: <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1739,7 +1716,7 @@ msgstr ""
 "<literal>APT::Get::AutomaticRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 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 "
@@ -1757,7 +1734,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 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</"
@@ -1768,7 +1745,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:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1777,7 +1754,7 @@ msgstr ""
 "<literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 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::"
@@ -1788,7 +1765,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1796,31 +1773,31 @@ msgid ""
 "Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
+"パッケージ�インストール�アップグレード�削除時�ユーザ������りや��"
+"形�進�情報をターミナルウィンドウ内�表示���。��データ�機械的�解��"
+"�る�ージョン����� apt � doc ディレクトリ��る README.progress-"
+"reporting を見�����。設定項目: <literal>Dpkg::Progress</literal>� "
+"<literal>Dpkg::Progress-Fancy</literal>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
-#, 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:553
 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;, &guidesdir; ��る APT ユーザガイド, &apt-"
-"preferences;, APT Howto"
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, &guidesdir; ��る APT ユーザガイド, &apt-preferences;, APT "
+"Howto"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1829,12 +1806,12 @@ msgstr ""
 "100 を返���。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "APT キャッシュ�������"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1847,7 +1824,7 @@ msgstr ""
 "�作を�供���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1857,14 +1834,14 @@ msgstr ""
 "���コマンド�よ���暗黙�実行�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1886,7 +1863,7 @@ msgstr ""
 "libreadline2</command> �出力を掲���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1912,7 +1889,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -1931,7 +1908,7 @@ msgstr ""
 "apt �ソースコードを調�る��最良��ょ�。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1940,7 +1917,7 @@ msgstr ""
 "上�引数�必��り��ん。以下�統計情報を表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1949,7 +1926,7 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1961,7 +1938,7 @@ msgstr ""
 "ケージ��。大多数�パッケージ���カテゴリ�入り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -1978,7 +1955,7 @@ msgstr ""
 "ケージ��り��ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -1991,7 +1968,7 @@ msgstr ""
 "ジ��xless パッケージ���������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2004,7 +1981,7 @@ msgstr ""
 "も�り����debconf-tiny �よ���供も�れ����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2019,7 +1996,7 @@ msgstr ""
 "�よ���り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -2033,7 +2010,7 @@ msgstr ""
 "ス�る場����値�パッケージ��数よりも��り大��数��り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2042,7 +2019,7 @@ msgstr ""
 "れ��存関係�数��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2053,7 +2030,7 @@ msgstr ""
 "�も�������ージョン����表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2062,7 +2039,7 @@ msgstr ""
 "覧を表示���。主�デ�ッグ用��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2071,7 +2048,7 @@ msgstr ""
 "�。 &dpkg; �共�使用�る�便利����&dselect; �も使用�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2080,7 +2057,7 @@ msgstr ""
 "概�を表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2089,12 +2066,12 @@ msgstr ""
 "能を実行���。�れ��指定��パッケージ�パッケージレコード�表示��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2114,14 +2091,14 @@ msgstr ""
 "ケージ��対����対象����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr "空白�区切��引数��複数�検索パターン� and を�る�������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2130,7 +2107,7 @@ msgstr ""
 "を満��他�パッケージ�一覧を表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2138,12 +2115,12 @@ msgstr ""
 "<literal>rdepends</literal> ��パッケージ���被�存関係を一覧表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -2157,7 +2134,7 @@ msgstr ""
 "generate</option> オプション�共�使用�る��常�便利��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -2168,7 +2145,7 @@ msgstr ""
 "�一覧��り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2188,7 +2165,7 @@ msgstr ""
 "GivenOnly</literal> をセット������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2201,12 +2178,12 @@ msgstr ""
 "表���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "注�) dotty ��パッケージ�より大��セット�グラフ�����ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2215,12 +2192,12 @@ msgstr ""
 "users/sander/html/gsvcg1.html\">VCG tool</ulink> � xvcg 専用��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -2232,7 +2209,7 @@ msgstr ""
 "�。一方�パッケージ�を指定��場��優先順�詳細情報を表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -2250,7 +2227,7 @@ msgstr ""
 "表示�る����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2261,7 +2238,7 @@ msgstr ""
 "pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2276,7 +2253,7 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2289,7 +2266,7 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2300,7 +2277,7 @@ msgstr ""
 "ç›®: <literal>APT::Cache::Important</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2314,7 +2291,7 @@ msgstr ""
 "replaceable></literal> 例: <literal>APT::Cache::ShowRecommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2323,7 +2300,7 @@ msgstr ""
 "ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2340,7 +2317,7 @@ msgstr ""
 "AllVersions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2351,7 +2328,7 @@ msgstr ""
 "option> を使用������。設定項目: <literal>APT::Cache::Generate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2360,7 +2337,7 @@ msgstr ""
 "Cache::NamesOnly</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2370,7 +2347,7 @@ msgstr ""
 "表示���。設定項目: <literal>APT::Cache::AllNames</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2381,7 +2358,7 @@ msgstr ""
 "RecurseDepends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2392,12 +2369,12 @@ msgstr ""
 "Installed</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2406,12 +2383,12 @@ msgstr ""
 "100 を返���。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "APT キー管�ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -2422,12 +2399,12 @@ msgstr ""
 "る�見��る��ょ�。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "コマンド"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2438,32 +2415,32 @@ msgstr ""
 "<literal>-</literal> ��る��標準入力�ら読�込���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "信頼キー一覧�らキーを削除���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "キー &synopsis-param-keyid; を標準出力�出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "信頼�るキーを���標準出力�出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "信頼キーを一覧表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "信頼キー�フィンガープリントを一覧表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2472,7 +2449,7 @@ msgstr ""
 "����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2482,10 +2459,11 @@ msgstr ""
 "ローカルキーリングをアーカイブキーリング�更新��も�有効������アーカ"
 "イブキーをローカルキーリング�ら削除���。アーカイブキーリング��使用中�"
 "ディストリビューション��る <literal>archive-keyring</literal> パッケージ "
-"(例: &keyring-distro; �� &keyring-package; パッケージ) ��供�れ����。"
+"(例�� &keyring-distro; �� &keyring-package; パッケージ) ��供�れ���"
+"�。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2502,12 +2480,12 @@ msgstr ""
 "有効��。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2516,7 +2494,7 @@ msgstr ""
 "�����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2532,47 +2510,47 @@ msgstr ""
 "��。��り新��キー���ファイル�追加�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "アーカイブキー�ローカル信頼データベース��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "&keyring-distro; アーカイブ信頼キー�キーリング��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr "削除�れ� &keyring-distro; アーカイブ信頼キー�キーリング��。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "パッケージ�自動的�インストール�れ������マークを変更���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2581,7 +2559,7 @@ msgstr ""
 "��マークを変更���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -2596,7 +2574,7 @@ msgstr ""
 "command> や <command>aptitude</command> �より削除�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2607,7 +2585,7 @@ msgstr ""
 "る����パッケージを削除���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2618,7 +2596,7 @@ msgstr ""
 "を自動的�削除�る�を防���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2633,7 +2611,7 @@ msgstr ""
 "�り��ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2642,7 +2620,7 @@ msgstr ""
 "キャンセル�る��使用���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2655,7 +2633,7 @@ msgstr ""
 "ケージ�自動的�インストール�れ��る場�����表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2665,7 +2643,7 @@ msgstr ""
 "����手動�インストール��パッケージ�一覧を表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2674,7 +2652,7 @@ msgstr ""
 "パッケージを出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2686,7 +2664,7 @@ msgstr ""
 "param-filename; �らパッケージ�状態を読�書����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2695,12 +2673,12 @@ msgstr ""
 "を返���。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "APT アーカイブ�証サ�ート"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -2713,7 +2691,7 @@ msgstr ""
 "を�証���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 msgid ""
 "If a package comes from a archive without a signature, or with a signature "
 "that apt does not have a key for, that package is considered untrusted, and "
@@ -2728,7 +2706,7 @@ msgstr ""
 "�������ソース�対���強制的�検証�れる�能性��り��。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2737,12 +2715,12 @@ msgstr ""
 "�証機能をサ�ート�����。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "信頼済アーカイブ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2759,7 +2737,7 @@ msgstr ""
 "イブメンテナ�責任��������。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2772,7 +2750,7 @@ msgstr ""
 "を確�������。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. In order to become "
@@ -2789,7 +2767,7 @@ msgstr ""
 "ナ�署��れ����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2802,14 +2780,15 @@ msgid ""
 msgstr ""
 "アップロード�れ�パッケージ�検証�れ�アーカイブ�格��れる��メンテナ�"
 "署�を�り外��パッケージ��ェックサムを計算���Packages ファイル�格��"
-"��。��後�全パッケージファイル��ェックサムを計算���Release ファイル"
+"��。��後�全 Packages ファイル��ェックサムを計算���Release ファイル"
 "�格����。Release ファイル���� &keyring-distro; リリース�アーカイブ"
 "キー�署��れ�&keyring-distro; ミラーサイト�パッケージや Packages ファイル"
-"��も��布�れ��。��キー��&keyring-package; パッケージ��録�れ��"
-"る�&keyring-distro; アーカイブキーリング���れ��。"
+"��も��布�れ��。��キー��<package>debian-archive-keyring</package> "
+"パッケージ��録�れ��る�&keyring-distro; アーカイブキーリング���れ�"
+"�。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2820,7 +2799,7 @@ msgstr ""
 "�。���APT �自動的�行���任�る��も����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2829,7 +2808,7 @@ msgstr ""
 "��考�られる 2 種類�攻撃を防�よ�設計�れ����。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2844,7 +2823,7 @@ msgstr ""
 "�るソフトウェアを掴��れ�り���。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2856,7 +2835,7 @@ msgstr ""
 "���悪��るソフトウェア��播�るよ��ファイルを変更����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2868,12 +2847,12 @@ msgstr ""
 "��機構�パッケージ���署�を補完�る�������。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "ユーザ�設定"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys, although an installation of "
@@ -2886,7 +2865,7 @@ msgstr ""
 "key</command> �キー�追加・削除�行���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2903,12 +2882,12 @@ msgstr ""
 "ファイルをダウンロード・検証��るよ���り��。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "アーカイブ�設定"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2917,7 +2896,7 @@ msgstr ""
 "下�よ��������。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2928,7 +2907,7 @@ msgstr ""
 "供) を実行�る��作�����。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2939,7 +2918,7 @@ msgstr ""
 "行���署�������。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2950,7 +2929,7 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -2960,16 +2939,16 @@ msgstr ""
 "ンテナ��述�最�� 2 ステップ�従���れ��り��ん。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2985,12 +2964,12 @@ msgstr ""
 ">Strong Distribution HOWTO</ulink> を�覧����。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "マニュアルページ作者"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -2999,12 +2978,12 @@ msgstr ""
 "Walters, Florian Weimer, Michael Vogt �作業を元������。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "APT CD-ROM 管�ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3017,7 +2996,7 @@ msgstr ""
 "�を行���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -3028,7 +3007,7 @@ msgstr ""
 "を補正��る�評価���れ��り��ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3043,7 +3022,7 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3054,7 +3033,7 @@ msgstr ""
 "ベース�管����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3063,23 +3042,18 @@ 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>."
+#: apt-cdrom.8.xml:81
 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 ""
-"マウント�イント - CD-ROM をマウント�る場所を指定���。��マウント�イン"
-"ト��<filename>/etc/fstab</filename> �正��設定�れ��る必���り��。"
-"設定項目: <literal>Acquire::cdrom::mount</literal>"
+"CD-ROM パス�自動検出を試行���ん。通常�<option>--cdrom</option> オプショ"
+"ン�組�����使���。設定項目: <literal>Acquire::cdrom::AutoDetect</"
+"literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 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.  "
@@ -3090,7 +3064,7 @@ msgstr ""
 "設定項目: <literal>Acquire::cdrom::mount</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3101,7 +3075,7 @@ msgstr ""
 "を入力�るよ�促���。設定項目: <literal>APT::CDROM::Rename</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3112,7 +3086,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3125,7 +3099,7 @@ msgstr ""
 "<literal>APT::CDROM::Fast</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3137,7 +3111,7 @@ msgstr ""
 "����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3148,12 +3122,12 @@ msgstr ""
 "CDROM::NoAct</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3162,12 +3136,12 @@ msgstr ""
 "100 を返���。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "APT 設定�得プログラム"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3180,7 +3154,7 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -3194,7 +3168,7 @@ msgstr ""
 "������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3206,7 +3180,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3215,7 +3189,7 @@ msgstr ""
 "値� <option>-f</option> ��り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -3226,12 +3200,12 @@ msgstr ""
 "を行���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "設定箇所�内容を表示�る����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3240,12 +3214,12 @@ msgstr ""
 "--no-empty �������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3262,13 +3236,13 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3277,27 +3251,27 @@ msgstr ""
 "� 100 を返���。"
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Debug::* �関�る最��ドキュメント"
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "APT �設定ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3310,21 +3284,21 @@ msgstr ""
 "ンドラインパーサを共有�����。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr "APT ツール�起動時��設定ファイルを以下�順番�読�込���。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr "<envar>APT_CONFIG</envar> 環境変数�指定��ファイル (存在�る場�)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3342,13 +3316,13 @@ msgstr ""
 "力���。一致�る場��黙��無視���。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr "<literal>Dir::Etc::Main</literal> �指定�れる�メイン設定ファイル"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3357,12 +3331,12 @@ msgstr ""
 "加読�込������。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "構文"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3376,7 +3350,7 @@ msgstr ""
 "プション��親グループ�ら�継承���ん。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3399,7 +3373,7 @@ msgstr ""
 "�よ��波カッコを使���新��スコープを開��������。"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3417,7 +3391,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -3428,13 +3402,13 @@ msgstr ""
 "ロン�区切���複数�エントリを表���。"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3443,7 +3417,7 @@ msgstr ""
 "考��る��ょ�。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3452,7 +3426,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal> ��る��も����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3467,7 +3441,7 @@ msgstr ""
 "����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3486,7 +3460,7 @@ msgstr ""
 "��る���注�������)。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3501,7 +3475,7 @@ msgstr ""
 "�ん。クリア�れる����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3519,7 +3493,7 @@ msgstr ""
 "ん)。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3547,12 +3521,12 @@ msgstr ""
 "����り��自分���よ��構文を修正������。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "APT グループ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3561,7 +3535,7 @@ msgstr ""
 "御���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3572,7 +3546,7 @@ msgstr ""
 "ル��アーキテク�ャ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3593,16 +3567,20 @@ msgstr ""
 "加���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 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 ""
+"構築�存�解決�����有効�����るビルドプロファイルを��空間�"
+"「<literal>profile.</literal>�接頭辞を�り除��も�全��一覧��。デフォル"
+"ト����一覧�空��。&dpkg-buildpackage; �利用�れる "
+"<envar>DEB_BUILD_PROFILES</envar> ���一覧よりも優先�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3615,7 +3593,7 @@ msgstr ""
 "'4.0', '5.0*'  ��り��。&apt-preferences; も�照������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3624,7 +3602,7 @@ msgstr ""
 "パッケージを無視���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -3638,7 +3616,7 @@ msgstr ""
 "注�������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 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 "
@@ -3662,7 +3640,7 @@ msgstr ""
 "�り�A ���存関係��も�満����ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3687,7 +3665,7 @@ msgstr ""
 "述�シナリオを解決�る方法��1�����������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 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 "
@@ -3703,7 +3681,7 @@ msgstr ""
 "も報告����������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 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 "
@@ -3724,7 +3702,7 @@ msgstr ""
 "�れら��存���るパッケージ以外���欠パッケージ�動作���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 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 "
@@ -3758,12 +3736,12 @@ msgstr ""
 "�自動増加を無効����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr "構築�存関係���欠�パッケージを定義���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3772,7 +3750,7 @@ msgstr ""
 "&apt-get; �文書を�照������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3781,7 +3759,7 @@ msgstr ""
 "� &apt-cache; �文書を�照������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3790,12 +3768,12 @@ msgstr ""
 "� &apt-cdrom; �文書を�照������。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3806,7 +3784,7 @@ msgstr ""
 "(&sources-list; も�照)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3826,7 +3804,7 @@ msgstr ""
 "下� <literal>Max-ValidTime</literal> オプションを使用����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3844,7 +3822,7 @@ msgstr ""
 "固有�設定を作�����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3862,7 +3840,7 @@ msgstr ""
 "定を作�����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3873,7 +3851,7 @@ msgstr ""
 "�。デフォルト�� True ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 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 "
@@ -3889,7 +3867,7 @@ msgstr ""
 "も�パッ�をダウンロード�る代�り��完全�ファイルをダウンロード���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3903,7 +3881,7 @@ msgstr ""
 "<literal>access</literal> ��URI タイプ��� 1 接続を開���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3912,7 +3890,7 @@ msgstr ""
 "�られ�回数��リトライを行���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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."
@@ -3922,7 +3900,7 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 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]/</"
@@ -3940,7 +3918,7 @@ msgstr ""
 "����環境変数 <envar>http_proxy</envar> を使用���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 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 "
@@ -3959,7 +3937,7 @@ msgstr ""
 "�汚れる�を防���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 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."
@@ -3969,7 +3947,7 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 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."
@@ -3987,7 +3965,7 @@ msgstr ""
 "フォルト値� 0 (= 無効) ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3996,14 +3974,7 @@ msgstr ""
 "����を制御���。デフォルト��有効��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
-#, 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:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4011,13 +3982,13 @@ msgid ""
 "bandwidth.  Note that this option implicitly disables downloading from "
 "multiple servers at the same time."
 msgstr ""
-"使用�る帯域を制��る���<literal>Acquire::http::Dl-Limit</literal> �キロ"
-"�イト�整数値を与���。デフォルト値� 0 ��制�を解除��使用��る帯域を"
-"���使������ (��オプション�暗黙的���時�複数�サー��らダウン"
-"ロード����る���注�������)。"
+"使用�る帯域を制��る���<literal>Acquire::http::Dl-Limit</literal> �秒�"
+"�り�キロ�イト�整数値を与���。デフォルト値� 0 ��制�を解除��使用�"
+"�る帯域を���使������。��オプション�暗黙的���時�複数�サー�"
+"�らダウンロード����る���注�������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4028,7 +3999,7 @@ msgstr ""
 "ロード�る����異�る User-Agent を設定����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 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 "
@@ -4040,9 +4011,17 @@ msgid ""
 "takes precedence over the legacy option name <literal>ProxyAutoDetect</"
 "literal>."
 msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> を使��利用�る http プ"
+"ロキシを検出�る���外部コマンドを指定����。APT �コマンド�標準出力� "
+"<literal>http://proxy:port/</literal> 形��プロキシを出力�る��を期待��"
+"���。�れ�全体を指定�る <literal>Acquire::http::Proxy</literal> よりも優"
+"先�れ��� <literal>Acquire::http::Proxy::$HOST</literal> 経由�セット��"
+"特定�ホスト�プロキシ設定��れよりも優先�れ��。avahi を利用�る実装例�"
+"���� &squid-deb-proxy-client; パッケージを見�����。��オプション�"
+"�� <literal>ProxyAutoDetect</literal> よりも優先�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4059,7 +4038,7 @@ msgstr ""
 "�����ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4097,7 +4076,7 @@ msgstr ""
 "���オプション��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 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]/</"
@@ -4129,7 +4108,7 @@ msgstr ""
 "literal>, <literal>$(SITE_PORT)</literal> ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4144,7 +4123,7 @@ msgstr ""
 "定例�サンプル設定ファイルを�照������)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 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 "
@@ -4157,7 +4136,7 @@ msgstr ""
 "FTP over HTTP を使用�る��推奨���ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4173,13 +4152,13 @@ msgstr ""
 "����注�������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4200,7 +4179,7 @@ msgstr ""
 "マンド� UMount �指定�る�������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4209,13 +4188,13 @@ msgstr ""
 "る�<literal>gpgv::Options</literal> ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, 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:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4233,19 +4212,19 @@ msgstr ""
 "�。構文�以下�よ���り��。<placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, 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:531
+#: apt.conf.5.xml:525
 #, 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:524
+#: apt.conf.5.xml:518
 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 "
@@ -4274,13 +4253,13 @@ msgstr ""
 "<literal>bz2</literal> �自動的�追加�れる���明示�る必���り��ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, 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:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4304,7 +4283,7 @@ msgstr ""
 "��定義�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4315,7 +4294,7 @@ msgstr ""
 "ん�ローカルミラー���有効��る���注�������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4328,7 +4307,7 @@ msgstr ""
 "�る際��CPU �能力を余計�消費���。デフォルト�� false ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4346,13 +4325,13 @@ msgstr ""
 "�������。長�言語コード�特�見����ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, 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:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4389,7 +4368,7 @@ msgstr ""
 "���注�������。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4402,22 +4381,22 @@ msgstr ""
 "後) �追加���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
-msgstr ""
+msgstr "ダウンロード時� IPv4 プロトコル��を使�よ��強制���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
-msgstr ""
+msgstr "ダウンロード時� IPv6 プロトコル��を使�よ��強制���。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "ディレクトリ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4436,28 +4415,31 @@ msgstr ""
 "サブアイテム�������付加�るデフォルトディレクトリを�ん����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> ��ローカルキャッシュ情報�関�る場所を格��"
 "����。�れ��ダウンロード済アーカイブ�場所を示� <literal>Dir::Cache::"
 "archives</literal> ��様��<literal>srcpkgcache</literal> � "
-"<literal>pkgcache</literal> �パッケージキャッシュ�場所��り��。�れ�れ"
-"�空文字をセット�る����キャッシュ�生�を無効�����。�れ�より起動"
-"時����り����ディスク容�を節約����。��ら��srcpkgcache よりも "
-"pkgcache を無効��る���多������。<literal>Dir::State</literal> ��"
-"様�<literal>Dir::Cache</literal> �デフォルトディレクトリを�ん����。"
+"<literal>pkgcache</literal> �パッケージキャッシュ�場所��り��。"
+"<literal>pkgcache</literal> や <literal>srcpkgcache</literal> � <literal>"
+"\"\"</literal> をセット�る����キャッシュ�生�を無効�����。�れ�よ"
+"り起動時����り����ディスク容�を節約����。��ら��srcpkgcache "
+"よりも pkgcache を無効��る���多������。<literal>Dir::State</"
+"literal> ��様�<literal>Dir::Cache</literal> �デフォルトディレクトリを�ん"
+"����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4471,7 +4453,7 @@ msgstr ""
 "ファイルを指定�れ�場������設定�効果��り��)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4482,7 +4464,7 @@ msgstr ""
 "���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4499,7 +4481,7 @@ msgstr ""
 "プログラム�場所を指定���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 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 +4501,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> �ら探���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4535,12 +4517,12 @@ msgstr ""
 "フォルト値を見れ���る通り���パターン��正�表�を使用����。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "DSelect �� APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4551,7 +4533,7 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4572,7 +4554,7 @@ msgstr ""
 "パッケージをダウンロード�る直��行���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4581,7 +4563,7 @@ msgstr ""
 "�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: 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 update phase."
@@ -4590,7 +4572,7 @@ msgstr ""
 "�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4599,12 +4581,12 @@ msgstr ""
 "���。デフォルト�エラー�発生��場�����。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "APT � &dpkg; を呼�方法"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4613,7 +4595,7 @@ msgstr ""
 "<literal>DPkg</literal> セクション��り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4623,7 +4605,7 @@ msgstr ""
 "��れ��り��ん。����リスト��一�引数��� &dpkg; �渡�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4635,14 +4617,7 @@ msgstr ""
 "bin/sh</filename> を通��呼�出�れ�何��題��れ� APT �異常終了���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
-#, 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:707
 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 "
@@ -4654,18 +4629,12 @@ msgstr ""
 "&dpkg; を呼�出���実行�るシェルコマンド�リスト��。<literal>options</"
 "literal> �よ��リスト記法�指定���れ��り��ん。コマンド� <filename>/"
 "bin/sh</filename> を通��呼�出�れ�何��題��れ��APT �異常終了��"
-"�。APT �インストール�よ���る全 .deb ファイル�ファイル�を�1 行��コ"
-"マンド�標準入力��り��。"
+"�。APT �インストール�よ���る全 .deb ファイル�ファイル�を��求��"
+"ファイルディスクリプタ����1 行���デフォルト��コマンド�標準入力��"
+"り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
-#, 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:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4674,12 +4643,11 @@ msgid ""
 msgstr ""
 "��プロトコル��ージョン 2 ���(プロトコル��ージョンや APT 設定スペー"
 "ス�パッケージを�む) 詳細情報やファイル�変更�れ��る�ージョンを出力��"
-"�。<literal>DPkg::Tools::options::cmd::Version</literal> � 2 を設定�る��"
-"�ージョン 2 を有効�����。<literal>cmd</literal> � <literal>Pre-"
-"Install-Pkgs</literal> �与�られるコマンド��。"
+"�。�ージョン 3 ��出力���ージョン�アーキテク�ャ� "
+"<literal>MultiArch</literal> フラグ�追加�れ����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4688,9 +4656,14 @@ msgid ""
 "the requested version it will send the information in the highest version it "
 "has support for instead."
 msgstr ""
+"コマンド <literal><replaceable>cmd</replaceable></literal> �利用�るプロトコ"
+"ル��ージョン� <literal>DPkg::Tools::options::<replaceable>cmd</"
+"replaceable>::Version</literal> �設定�より�択���デフォルト��ージョン "
+"1 �������。リクエスト���ージョンを APT �サ�ート�����場��サ"
+"�ート���る最大��ージョン�情報を代�り��り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4699,9 +4672,15 @@ 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 ""
+"情報��信�利用�るファイルディスクリプタ� <literal>DPkg::Tools::options::"
+"<replaceable>cmd</replaceable>::InfoFD</literal> �よりリクエスト���デフォ"
+"ルト� <literal>0</literal> �標準入力を指定���。�ージョン 0.9.11 �ら利"
+"用�能��り���。環境変数 <envar>APT_HOOK_INFO_FD</envar> を見る�����"
+"オプション�対応���る��を検出����れ��確����利用���るファイ"
+"ルディスクリプタ�番���録�れ����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4710,7 +4689,7 @@ msgstr ""
 "<filename>/</filename> ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4719,12 +4698,12 @@ msgstr ""
 "��。デフォルト��署�を無効���全�イナリを生����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr "dpkg トリガ�使�方 (�よ�関連オプション)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 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 "
@@ -4748,7 +4727,7 @@ msgstr ""
 "(も����れ以上) �時間 100% �����り�進�レ�ートを壊�������。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4762,7 +4741,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4785,7 +4764,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4805,7 +4784,7 @@ msgstr ""
 "在 APT ����フラグを�展開呼�出�や削除呼�出��も追加���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4832,7 +4811,7 @@ msgstr ""
 "能性��る�ら��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4849,7 +4828,7 @@ msgstr ""
 "���最後以外�����実行��無効�����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4864,7 +4843,7 @@ msgstr ""
 "���注�������。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4882,7 +4861,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 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 "
@@ -4905,12 +4884,12 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Periodic オプション� Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 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 +4902,12 @@ msgstr ""
 "ト����スクリプト�先頭を�照������。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "デ�ッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4944,7 +4923,7 @@ msgstr ""
 "�オプション�興味�����ょ���以下�も��興味を引��も�れ��ん。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4955,7 +4934,7 @@ msgstr ""
 "����。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4966,7 +4945,7 @@ msgstr ""
 "literal>) を行�場��使用���。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4978,7 +4957,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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4987,34 +4966,34 @@ msgstr ""
 "��よ�����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 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:896
+#: apt.conf.5.xml:891
 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:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用��パッケージ�ダウンロード�関�る情報を出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用��パッケージ�ダウンロード�関�る情報を出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用��パッケージ�ダウンロード�関�る情報を出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5022,7 +5001,7 @@ msgstr ""
 "<literal>gpg</literal> を用��暗�署��検証�関�る情報を出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5031,12 +5010,12 @@ msgstr ""
 "���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 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:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5044,7 +5023,7 @@ msgstr ""
 "<literal>apt</literal> ライブラリ�生����暗�化�ッシュを出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5054,7 +5033,7 @@ msgstr ""
 "システム��る使用済・未使用ブロック�数�ら�情報を����よ�����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5063,13 +5042,13 @@ msgstr ""
 "<quote><literal>apt-get update</literal></quote> を実行��るよ���り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 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:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5078,7 +5057,7 @@ msgstr ""
 "ジやエラーを出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5087,7 +5066,7 @@ msgstr ""
 "���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5096,14 +5075,14 @@ msgstr ""
 "リスト��パッ��用�関�る情報を出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 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:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5112,7 +5091,7 @@ msgstr ""
 "�出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5127,7 +5106,7 @@ msgstr ""
 "路�対応�����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5156,7 +5135,7 @@ msgstr ""
 "��。<literal>section</literal> �パッケージ��れるセクション���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5165,7 +5144,7 @@ msgstr ""
 "切られ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5174,7 +5153,7 @@ msgstr ""
 "を解�中�発生��エラーを出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5183,18 +5162,18 @@ msgstr ""
 "�トレースを生����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 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:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr "起動時��パッケージ�優先度を表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5203,7 +5182,7 @@ msgstr ""
 "��場������用�れ��)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5214,7 +5193,7 @@ msgstr ""
 "説明��も������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5223,21 +5202,24 @@ msgstr ""
 "���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 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 ""
+"apt�フック�より呼�出�れる外部コマンドを表示���。�れ��例���設定オ"
+"プション <literal>DPkg::{Pre,Post}-Invoke</literal> や <literal>APT::Update::"
+"{Pre,Post}-Invoke</literal> ��り��。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "サンプル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5247,17 +5229,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "APT 用�択制御ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5269,7 +5251,7 @@ msgstr ""
 "ンストール�るパッケージ��ージョンを制御�る��使用���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5290,7 +5272,7 @@ msgstr ""
 "���択を�ユーザ��択��るよ���り��。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -5305,7 +5287,7 @@ msgstr ""
 "��インスタンス��択��影響���ん。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -5328,7 +5310,7 @@ msgstr ""
 "ん)。以上�警告����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5348,24 +5330,24 @@ msgstr ""
 "�る場��黙��無視���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "APT �デフォルト優先度�割り当�"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -5391,7 +5373,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
@@ -5400,12 +5382,12 @@ msgstr ""
 "�ージョン�優先度を設定���。以下�よ��割り当���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "優先度 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5418,12 +5400,12 @@ msgstr ""
 "アーカイブ由���ージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "優先度 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5436,30 +5418,30 @@ msgstr ""
 "\"ButAutomaticUpgrades: yes\" �マーク�れ��るアーカイブ由���ージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "優先度 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr "インストール�れ��ら��ターゲットリリース���れ���ージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "優先度 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr "インストール�れ��ら��ターゲットリリース���れる�ージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -5477,7 +5459,7 @@ msgstr ""
 "���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5486,7 +5468,7 @@ msgstr ""
 "を上�ら順番��用���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5501,12 +5483,12 @@ msgstr ""
 "�。���パッケージ�ダウングレード��険��る���も注�������)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "最も高�優先度��ージョンをインストール���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5515,7 +5497,7 @@ msgstr ""
 "�高�も�) をインストール���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5526,7 +5508,7 @@ msgstr ""
 "トール�れ����も�をインストール���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5541,7 +5523,7 @@ msgstr ""
 "get upgrade</command> を実行�る�パッケージ�更新�れ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5554,7 +5536,7 @@ msgstr ""
 "get upgrade</command> を実行��も�ダウングレード���ん。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5573,12 +5555,12 @@ msgstr ""
 "ケージ��る�ら��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "APT プリファレンスファイル�効果"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5590,7 +5572,7 @@ msgstr ""
 "れ����。レコード�特定形���汎用形����ら��形�を�り��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5606,7 +5588,7 @@ msgstr ""
 "���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5618,7 +5600,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -5632,7 +5614,7 @@ msgstr ""
 "���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -5643,7 +5625,7 @@ msgstr ""
 "全パッケージ�����高�優先度を割り当���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5655,7 +5637,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -5668,7 +5650,7 @@ msgstr ""
 "���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5680,7 +5662,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5694,7 +5676,7 @@ msgstr ""
 "トアドレス�����\"Debian\" や \"Ximian\" ����作者やベンダ���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5704,7 +5686,7 @@ msgstr ""
 "ディストリビューション�属�るパッケージを����低�優先度�割り当���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5716,7 +5698,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5727,7 +5709,7 @@ msgstr ""
 "り当���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5739,7 +5721,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5750,7 +5732,7 @@ msgstr ""
 "�属�るパッケージを����高�優先度�割り当���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5762,12 +5744,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "正�表�� &glob; 構文"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -5781,7 +5763,7 @@ msgstr ""
 "ケージ��優先度500を割り当���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -5793,7 +5775,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -5804,7 +5786,7 @@ msgstr ""
 "パッケージ��優先度 990 を割り当���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5816,7 +5798,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -5833,12 +5815,12 @@ msgstr ""
 "体��見��れ��ん。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "APT �優先度�割り込む方法"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -5847,12 +5829,12 @@ msgstr ""
 "��ん。�れ� (���������) 以下�よ��解釈�れ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -5860,12 +5842,12 @@ msgstr ""
 "パッケージ�ダウングレード��も����ージョン�パッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -5874,12 +5856,12 @@ msgstr ""
 "���れ���も����ージョン�パッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -5888,12 +5870,12 @@ msgstr ""
 "ジョン�方�新������れ�����ージョン�パッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -5903,12 +5885,12 @@ msgstr ""
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -5917,17 +5899,17 @@ msgstr ""
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "���ージョン�インストール�止"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -5940,7 +5922,7 @@ msgstr ""
 "�ージョン�優先度を決定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -5949,7 +5931,7 @@ msgstr ""
 "仮定������。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5977,12 +5959,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "�る��以下�よ��動作���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -5996,7 +5978,7 @@ msgstr ""
 "れ��る場��<literal>perl</literal> �ダウングレード�れ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6007,7 +5989,7 @@ msgstr ""
 "�り��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6020,12 +6002,12 @@ msgstr ""
 "�場����インストール�れ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "パッケージ��ージョン�ディストリビューションプロパティ�決定"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6036,7 +6018,7 @@ msgstr ""
 "filename> ファイルを�供���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6054,27 +6036,27 @@ msgstr ""
 "��。APT 優先度�設定��レコード���以下� 2 行����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "<literal>Package:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "パッケージ�"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "<literal>Version:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "�����パッケージ��ージョン番�"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6095,12 +6077,12 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6116,18 +6098,18 @@ msgstr ""
 "ル���値を指定�る���以下�行�必���り��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "<literal>Codename:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6144,13 +6126,13 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6167,7 +6149,7 @@ msgstr ""
 "り��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6179,12 +6161,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "<literal>Component:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6201,18 +6183,18 @@ msgstr ""
 "下�行�必���り��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "<literal>Origin:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6224,18 +6206,18 @@ msgstr ""
 "ファイル����供者を指定�る���以下�行�必���り��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "<literal>Label:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6247,13 +6229,13 @@ msgstr ""
 "ファイル���ラベルを指定�る���以下�行�必���り��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6278,12 +6260,12 @@ msgstr ""
 "filename> ファイルを�ん����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "APT プリファレンスレコード�オプション行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6293,12 +6275,12 @@ msgstr ""
 "literal> �始�る行を����。�れ��コメント用�場所を確����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "安定版�追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6322,7 +6304,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6337,8 +6319,8 @@ msgstr ""
 "�。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6350,7 +6332,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6362,13 +6344,13 @@ msgstr ""
 "����。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6381,12 +6363,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "テスト版や�安定版�追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6414,7 +6396,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6431,7 +6413,7 @@ msgstr ""
 "先度を割り当���。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6443,13 +6425,13 @@ msgstr ""
 "ド����。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6468,12 +6450,12 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "コード�リリース�進化�追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6507,7 +6489,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6531,7 +6513,7 @@ msgstr ""
 "�。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6544,13 +6526,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6569,17 +6551,17 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "APT �データ�得元�設定リスト"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6595,7 +6577,7 @@ msgstr ""
 "�コマンド) ��得���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6609,12 +6591,12 @@ msgstr ""
 "�り��。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -6635,12 +6617,12 @@ msgstr ""
 "APT �出力���。一致�る場��黙��無視���。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "deb タイプ� deb-src タイプ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6665,7 +6647,7 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6675,14 +6657,13 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
-#, fuzzy, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:76
+#, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ オプション ] uri distribution [コン�ー�ント1] [コン�ー�ント2] [...]"
+msgstr "deb [ オプション ] uri スイート [コン�ー�ント1] [コン�ー�ント2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6703,26 +6684,35 @@ msgid ""
 "     [option1]: [option1-value]\n"
 "   "
 msgstr ""
+"     Types: deb deb-src\n"
+"     URIs: http://example.com\n"
+"     Suites: stable testing\n"
+"     Sections: component1 component2\n"
+"     Description: short\n"
+"      long long long\n"
+"     [option1]: [option1-value]\n"
+"\n"
+"     Types: deb\n"
+"     URIs: http://another.example.com\n"
+"     Suites: experimental\n"
+"     Sections: component1 component2\n"
+"     Enabled: no\n"
+"     Description: short\n"
+"      long long long\n"
+"     [option1]: [option1-value]\n"
+"   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
+"他� 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."
+#: sources.list.5.xml:99
 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.  "
@@ -6734,25 +6724,16 @@ msgid ""
 "<literal>component</literal> must be present."
 msgstr ""
 "<literal>deb</literal> タイプ� URI ��APT �必��情報を見��られるよ�"
-"��Debian ディストリビューション�基底を指定���れ��り��ん。"
-"<literal>distribution</literal> ��正確�パスを指定����。��場� "
-"component を�略��<literal>distribution</literal> �スラッシュ (<literal>/"
-"</literal>) �終�ら�����り��ん。�れ� URL �指定�れ�アーカイブ��"
-"特定�サブセクション���関心��る���役�立���。"
-"<literal>distribution</literal> �正確�パスを指定�����ら�少���も�"
-"��� <literal>component</literal> を指定���れ��り��ん。"
+"��Debian ディストリビューション�基底を指定���れ��り��ん。<literal>"
+"スイート</literal>��正確�パスを指定����。��場�コン�ー�ントを�略"
+"��<literal>スイート</literal>�スラッシュ (<literal>/</literal>) �終�ら�"
+"����り��ん。�れ� URL �指定�れ�アーカイブ��特定�サブセクション�"
+"��関心��る���役�立���。<literal>スイート</literal>�正確�パスを指"
+"定�����ら�少���も���� <literal>コン�ー�ント</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."
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -6762,29 +6743,16 @@ msgid ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
-"<literal>distribution</literal> ��<literal>$(ARCH)</literal> 変数を�む場�"
-"��り��。<literal>$(ARCH)</literal> 変数��システム�使用���る Debian "
-"アーキテク�ャ (<literal>amd64</literal> や <literal>armel</literal> ��) �"
-"展開�れ��。�れ�より�アーキテク�ャ��存��� <filename>sources.list</"
+"<literal>スイート</literal> ��<literal>$(ARCH)</literal> 変数を�む場���"
+"り��。<literal>$(ARCH)</literal> 変数��システム�使用���る Debian アー"
+"キテク�ャ (<literal>amd64</literal> や <literal>armel</literal> ��) �展開"
+"�れ��。�れ�より�アーキテク�ャ��存��� <filename>sources.list</"
 "filename> ファイルを使用����。一般的���れ�正��パスを指定�る���"
 "気��る����。�����場���<literal>APT</literal> ��在�アーキテク"
 "�ャ� URI を自動的�生����。"
 
 #. 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."
+#: sources.list.5.xml:116
 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 "
@@ -6798,17 +6766,18 @@ msgid ""
 "users. APT also parallelizes connections to different hosts to more "
 "effectively deal with sites with low bandwidth."
 msgstr ""
-"有効�全 distribution, component �場所�ら�一部�必��場��1 行��� 1 "
-"distribution ��指定��������� URI �行を複数記述�る����る�"
-"�ょ�。APT �内部� URI リストを生����ら�並�替���。������イン"
-"ター�ットホスト�対���複数��照を�����。例�� FTP 接続後�切断��"
-"�ら����ホスト��接続�る�����効率�悪���を����1 接続���"
-"���。��機能���時接続匿�ユーザ数を制����る�混ん��る FTP サイト"
-"�アクセス�る��便利��。APT ��帯域�狭�サイトを効率よ�扱����異�"
-"るホスト���接続を並行��行�よ��も�����。"
+"��形�� sources.list �記法��有効�ディストリビューションやコン�ー�ン"
+"ト�場所全��ら�一部�必��場��1 行��� 1 ��ディストリビューション�"
+"�指定��������� URI �行を複数記述�る����る��ょ�。APT �内部"
+"� URI リストを生����ら�並�替���。������インター�ットホスト�"
+"対���複数��照を�����。例�� FTP 接続後�切断���ら����ホスト"
+"��接続�る�����効率�悪���を����1 接続������。��機能"
+"���時接続匿�ユーザ数を制����る�混ん��る FTP サイト�アクセス�る�"
+"�便利��。APT ��帯域�狭�サイトを効率よ�扱����異�るホスト���接"
+"続を並行��行�よ��も�����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -6824,7 +6793,7 @@ msgstr ""
 "�)。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -6838,27 +6807,20 @@ msgstr ""
 "literal> オプション�定義���る�全アーキテク�ャをダウンロード���。"
 
 #. 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."
+#: sources.list.5.xml:140
 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> �より���アーキテク�ャ情報をダウンロード�る�指"
-"定���。��オプションを指定�������<literal>APT::Architectures</"
-"literal> オプション�定義���る�全アーキテク�ャをダウンロード���。"
+"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> �る�� <literal>arch-=<replaceable>arch1</"
+"replaceable>,<replaceable>arch2</replaceable>,…</literal> を使���ダウン"
+"ロード�るアーキテク�ャを追加�削除����。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -6875,7 +6837,7 @@ msgstr ""
 "�証���扱���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -6888,12 +6850,12 @@ msgstr ""
 "�ょ�。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "例:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6905,17 +6867,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "URI �仕様"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "�在�識��る URI タイプ�以下���り��。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6925,7 +6887,7 @@ msgstr ""
 "����。�れ� NFS マウントやローカルミラー�便利��。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6935,7 +6897,7 @@ msgstr ""
 "グラムを使用������。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6951,7 +6913,7 @@ msgstr ""
 "指定������。���証方法�安全�������注�������。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6970,7 +6932,7 @@ msgstr ""
 "�)。設定ファイル� HTTP を利用�るプロキシ�指定�����も�無視�れ��。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -6982,7 +6944,7 @@ msgstr ""
 "用�����APT �コピーを行�場��便利��。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6996,12 +6958,12 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "�ら��識��る URI タイプ�追加"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7019,7 +6981,7 @@ msgstr ""
 "transport-debtorrent; を�照������。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7028,35 +6990,35 @@ msgstr ""
 "free 用�ローカル (��� NFS) アーカイブを使用���。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr "上記��様�����安定版 (開発版) を使用���。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "上記�ソース行�以下�よ���り��。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7067,7 +7029,7 @@ msgstr ""
 "<literal>armel</literal> アーキテク�ャ�パッケージ情報を�得���。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7077,7 +7039,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7086,13 +7048,13 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7101,13 +7063,13 @@ msgstr ""
 "&stable-codename;/contrib ��を使用���。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7120,19 +7082,19 @@ msgstr ""
 "�����り��。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7151,17 +7113,17 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7170,7 +7132,7 @@ msgstr ""
 "るユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7184,12 +7146,12 @@ msgstr ""
 "�れ�対��以下�形�� 1 行��出力���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "package version template-file config-script"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7204,7 +7166,7 @@ msgstr ""
 "�り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7215,7 +7177,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7224,12 +7186,12 @@ msgstr ""
 "���進� 100 を返���。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "パッケージインデックスファイル�ソートユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -7241,14 +7203,14 @@ msgstr ""
 "���内部�ソート�則�従���内部フィールド����もソートを行���。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 "出力����標準出力��られ�入力�検索��るファイル���れ��り��ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7257,7 +7219,7 @@ msgstr ""
 "<literal>APT::SortPkgs::Source</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7266,12 +7228,12 @@ msgstr ""
 "� 100 を返���。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "インデックスファイル生�ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -7283,7 +7245,7 @@ msgstr ""
 "��元�サイト�内容�基��生��れる����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7297,7 +7259,7 @@ msgstr ""
 "全�アーカイブ�生�プロセス「スクリプト���る綿密�手段を�ん����。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -7311,7 +7273,7 @@ msgstr ""
 "望��圧縮出力ファイル�作�を自動的�実行���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7324,13 +7286,13 @@ msgstr ""
 "�������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr "<option>--db</option> オプション��キャッシュ DB を指定����。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7343,7 +7305,7 @@ msgstr ""
 "��&dpkg-scansources; �������。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -7354,7 +7316,7 @@ msgstr ""
 "override オプションを使用���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7371,7 +7333,7 @@ msgstr ""
 "�出力���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7397,7 +7359,7 @@ msgstr ""
 "出���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7417,7 +7379,7 @@ msgstr ""
 "<literal>Components</literal>, <literal>Description</literal> ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -7431,7 +7393,7 @@ msgstr ""
 "�ディレクトリ�ら作��る�を指定�る�柔軟�方法を�供���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7440,12 +7402,12 @@ msgstr ""
 "も�必���レコードを削除��整����。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "Generate 設定"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7462,7 +7424,7 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7470,12 +7432,12 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "<literal>Dir</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7487,7 +7449,7 @@ msgstr ""
 "を生��る���後�セクション�定義�れる相対パス������れ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -7497,17 +7459,17 @@ msgstr ""
 "リ�� <filename>ls-LR</filename> � dist ノード��り��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "オー�ーライドファイル�場所を指定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "キャッシュファイル�場所を指定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7516,12 +7478,12 @@ msgstr ""
 "ファイル�場所を指定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "<literal>Default</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7532,7 +7494,7 @@ msgstr ""
 "を�セクション���設定�上書����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -7544,7 +7506,7 @@ msgstr ""
 "方法�デフォルト���� '. gzip' ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7553,7 +7515,7 @@ msgstr ""
 "deb' ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7562,7 +7524,7 @@ msgstr ""
 "指定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7571,7 +7533,7 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7580,7 +7542,7 @@ msgstr ""
 "指定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7589,7 +7551,7 @@ msgstr ""
 "ル�圧縮を制御���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7600,7 +7562,7 @@ msgstr ""
 "使���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -7609,7 +7571,7 @@ msgstr ""
 "インデックスファイル��umask を無視����モードを使用���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7619,12 +7581,12 @@ msgstr ""
 "<filename>Translation-en</filename> ファイル�分割�る�を指定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "<literal>TreeDefault</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7635,7 +7597,7 @@ msgstr ""
 "�展開���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -7645,7 +7607,7 @@ msgstr ""
 "ルをラウンドロビン��数日経������生����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -7661,7 +7623,7 @@ msgstr ""
 "��少���も新��ファイル�必���。デフォルト� 10 �����日��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7670,7 +7632,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/</filename> ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7679,7 +7641,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/</filename> ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7688,7 +7650,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename> ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7697,7 +7659,7 @@ msgstr ""
 "$(SECTION)/source/Sources</filename> ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7708,7 +7670,7 @@ msgstr ""
 "$(SECTION)/i18n/Translation-en</filename> ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -7718,7 +7680,7 @@ msgstr ""
 "設定���。デフォルト��<filename>$(DIST)/$(SECTION)/</filename> ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -7732,12 +7694,12 @@ msgstr ""
 "ftparchive</command> �自動�パッケージファイルを�����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr "contents �出力�付�るヘッダファイルを設定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -7746,7 +7708,7 @@ msgstr ""
 "クション���データベースを共有����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -7757,7 +7719,7 @@ msgstr ""
 "トリ�先頭�����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -7769,12 +7731,12 @@ msgstr ""
 "トリ�先頭�����。ソースインデックスを処��る際�使用���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "<literal>Tree</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -7788,7 +7750,7 @@ msgstr ""
 "<literal>Directory</literal> 変数�定義�れ��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -7801,7 +7763,7 @@ msgstr ""
 "codename;</filename> �よ���り��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -7811,7 +7773,7 @@ msgstr ""
 "�変数��様��<literal>Tree</literal> セクション�使用����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -7825,7 +7787,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -7836,7 +7798,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -7846,7 +7808,7 @@ msgstr ""
 "<literal>main contrib non-free</literal> �よ���り��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -7857,7 +7819,7 @@ msgstr ""
 "��。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -7866,7 +7828,7 @@ msgstr ""
 "セクション�優先度�メンテナ�アドレス����情報���れ����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -7875,22 +7837,22 @@ msgstr ""
 "クション�情報���れ����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "�イナリ特別オー�ーライドファイルを設定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "ソース特別オー�ーライドファイルを設定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "<literal>BinDirectory</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -7904,12 +7866,12 @@ msgstr ""
 "<literal>Section</literal><literal>Architecture</literal> 設定�似����。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "Packages ファイル�出力先を設定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -7918,42 +7880,42 @@ msgstr ""
 "� <literal>Sources</literal> ��������必���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "Contents ファイル�出力先を設定��� (オプション)。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "�イナリオー�ーライドファイルを設定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "ソースオー�ーライドファイルを設定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "全出力パス�付加�るパス。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "ファイル一覧ファイルを指定���。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "�イナリオー�ーライドファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -7968,19 +7930,19 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -7997,12 +7959,12 @@ msgstr ""
 "�。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "ソースオー�ーライドファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8013,12 +7975,12 @@ msgstr ""
 "ケージ��2 番目�フィールド�割り当�るセクション��。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "特別オー�ーライドファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8028,7 +7990,7 @@ msgstr ""
 "�。3 列�ら�り�先頭�パッケージ�2番目�タグ�残り�新��値��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8051,7 +8013,7 @@ msgstr ""
 "literal>, <literal>SHA1</literal>, <literal>SHA256</literal> ��り��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8060,7 +8022,7 @@ msgstr ""
 "ç›®: <literal>APT::FTPArchive::DB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -8073,7 +8035,7 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -8086,7 +8048,7 @@ msgstr ""
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -8101,7 +8063,7 @@ msgstr ""
 "<literal>APT::FTPArchive::Contents</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8111,7 +8073,7 @@ msgstr ""
 "�択���。設定項目: <literal>APT::FTPArchive::SourceOverride</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8120,7 +8082,7 @@ msgstr ""
 "FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8133,7 +8095,7 @@ msgstr ""
 "�付���。設定項目: <literal>APT::FTPArchive::Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8156,7 +8118,7 @@ msgstr ""
 "加�ェック����味��り��ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8171,13 +8133,13 @@ msgstr ""
 "�生���る���注�������。"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8186,7 +8148,7 @@ msgstr ""
 "��以下�よ�����。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8194,34 +8156,51 @@ msgstr ""
 "<command>apt-ftparchive</command> �正常終了時� 0 を返���。エラー時���"
 "進� 100 を返���。"
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "ja"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "APT ユーザガイド"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr "�ージョン &apt-product-version;"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr "本文書� APT パッケージマ�ージャ�使�方�概�を�供���。"
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr "ライセンス����"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8233,8 +8212,8 @@ msgstr ""
 "published by the Free Software Foundation; either version 2 of the License, "
 "or (at your option) any later version."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8242,35 +8221,42 @@ msgstr ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "全般"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
+"APT パッケージ��在�APT <command>dselect</command> メソッド� <command>apt-"
+"get</command> コマンドラインユーザインターフェイス�2�を�録�����。両方"
+"�もインター�ット�ら新��パッケージをダウンロード�る���様�パッケージ"
+"をインストール�削除�る方法を�供�����。"
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "パッケージシステム�構造"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""
+"Debian パッケージシステム���パッケージ�関連�る膨大�情報��り�システム"
+"�手際良�簡��統��る��を支����。��最も���機能��存システム�"
+"�。"
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8278,27 +8264,40 @@ msgid ""
 "things the average user is required to install. Also, it allows for choices "
 "in mail transport agents, X servers and so on."
 msgstr ""
+"�存システム�より�システム��るライブラリ等�共有�素を個々�プログラムを"
+"使�るよ���り��。簡��言���プログラム����れ�利用�れる部分を別"
+"個�パッケージ��置���平�的ユーザ�インストールを必���るも��数を減"
+"ら���。���メール転�エージェントや X サー�等��択���るよ��も�り"
+"��。"
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
 "package requires another package to be installed at the same time to work "
 "properly."
 msgstr ""
+"�存システム��解����純��存�概念を把��る���ら始�り��。�純�"
+"�存�������るパッケージ��切�機能�る����別�パッケージ��時�"
+"インストール�れ��る必���る�������。"
 
-#. type: <p></p>
-#: guide.sgml:63
+# Translator's NOTE: maybe s/GPGP/GPG/?
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
 "simple dependency on GPG. Also, because it is an emacs extension it has a "
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
+"例�� mailcrypt � emacs を拡張�るプログラム��GPG �よるメール�暗�化を"
+"支����。GPGP �インストール�れ����れ� mailcrypt �役�立����� "
+"mailcrypt �� GPG ��純��存�����。����れ� emacs �拡張��� "
+"emacs ��純��存��emacs ����何�役�も立���ん。"
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8309,9 +8308,17 @@ msgid ""
 "system so all mail transport agents have a conflicting dependency with all "
 "other mail transport agents."
 msgstr ""
+"�解�����������も�一������存�競��る�存��り��。�れ"
+"��るパッケージ�別�パッケージ��時�インストール�れ��る�機能���シ"
+"ステム�������有害���も�り��。例��� sendmail や exim�qmail 等"
+"�メール転�エージェント�考�����ょ�。メール転�エージェント��れも"
+"メールを���る���ットワークを待���る必���る���2�インストール�"
+"る�����能��。複数インストール�る�システム��大�被害を与�る�能性"
+"��る���メール転�エージェント��れも他��らゆるメール転�エージェント"
+"�競��存�������。"
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8322,86 +8329,122 @@ msgid ""
 "depend on mail-transport-agent. This can add a great deal of confusion when "
 "trying to manually fix packages."
 msgstr ""
+"複雑�例�����別�パッケージ�よ��装�パッケージ��り��。exim � "
+"sendmail ����見��る����多��目的��一��両方�もメールを����"
+"一般的インターフェイスを解釈���。����パッケージシステム����らも "
+"mail-transport-agents ��宣言�る方法��り��。���� exim � sendmail "
+"�両方�も mail-transport-agent を�供�る�宣言��他�メール転�エージェン"
+"トを必���るパッケージ� mail-transport-agent ��存���。手作業�より"
+"パッケージを修正�よ�������多大�混乱�生�れる�能性��り��。"
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
 "issues by providing a number of automatic algorithms that help in selecting "
 "packages for installation."
 msgstr ""
+"既�インストール�れ��る��る���れ����パッケージ�����1���存"
+"�生�れる�能性�常��り��。APT �インストール�るパッケージ��択を支�"
+"�る自動化��アルゴリズムを�����供�る����存�題�解決支��努��"
+"�。"
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
 msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
 msgstr ""
+"<command>apt-get</command> �コマンドライン�らパッケージをインストール�る簡"
+"��方法を�供���。<command>dpkg</command> ��異�り�<command>apt-get</"
+"command> � .deb ファイルを解釈���連��る��パッケージ特有�����イン"
+"ストール��る��<emphasis>ソース</emphasis>��る .deb アーカイブ����。"
 
-#. type: <p></p>
-#: guide.sgml:109
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
 msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
 msgstr ""
+"http プロキシサー�を使���る場���� http_proxy 環境変数をセット�る必�"
+"��り��。sources.list(5) を見�����"
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"<command>apt-get</command> を使�����やる�����<placeholder type="
+"\"footnote\" id=\"0\"/>パッケージ一覧を<emphasis>ソース</emphasis>�ら�得�"
+"る�����れ�より利用��るパッケージ���るよ���り��。�れ�� "
+"<literal>apt-get update</literal> を実行���。例��"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
-msgstr ""
+msgstr "更新後�複数�コマンドを使���:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
-msgstr ""
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
+msgstr ""
+"upgrade を行��システム全体を�や��アップグレード���。アップグレード�"
+"�新��パッケージ�インストールや既存�パッケージ�削除�アップグレード�る"
+"�他�パッケージを破壊�る�能性��る場����パッケージ�アップグレード�"
+"行���ん。�れ�毎日実行��システムを比較的安全�アップグレード����。"
+"upgrade を行��アップグレード����パッケージ��る場����一覧を表示�"
+"��。�れ�通常新��パッケージ��存���る�他�パッケージ�競����る"
+"�������り��。<command>dselect</command> や <literal>apt-get "
+"install</literal> を使�������パッケージを強制的�インストール���"
+"�。"
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8411,236 +8454,348 @@ msgid ""
 "listed packages and will print a summary and ask for confirmation if "
 "anything other than its arguments are changed."
 msgstr ""
+"install を使��パッケージを���よりインストール���。パッケージ�自動的"
+"��得�インストール�れ��。�れ�インストール�るパッケージ����既��"
+"����� GUI を使���択�����場��有用��。インストール�るパッケー"
+"ジ���ら�も指定���全��得�れ��。install ��対象パッケージ一覧�ら"
+"自動的��存�題�解決�努�����を�示��指示以外�変更��る場��確�"
+"を促���。"
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
+"dist-upgrade �完全�アップグレードを行�よ��設計�れ����Debian �リ"
+"リース間�アップグレードを�純化���。洗練�れ�アルゴリズムを使���シス"
+"テムを��る��最新�リリース��る���インストール�アップグレード�削除"
+"�る最善�パッケージ群を決定���。状��よ��� <command>dselect</"
+"command> �手作業�より時間を掛���存を解決�るよりも dist-upgrade を使�方"
+"�希望�����も�れ��ん。dist-upgrade 完了後� <command>dselect</"
+"command> を使���残���るパッケージ��れ�インストール����。"
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
+"dist-upgrade �実行�る内容をよ�観察�る������。��り驚�よ��判断�"
+"��れる��も�り��。"
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
 msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed 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 used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> 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 <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
 msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:168
+"<command>apt-get</command> ��コマンドラインオプション�複数�り�man ページ"
+"� <citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry> �詳細�説明�れ����。最も有用�オプション��"
+"得��ファイルをインストール��� <literal>-d</literal> ��。システム�大�"
+"�パッケージをダウンロード�る必���る場��何�������������イ"
+"ンストールを開始�る��望��������ょ�。<literal>-d</literal> を指定"
+"�る��ダウンロード�����コマンドを�純����<literal>-d</literal> を"
+"付���実行�る���ダウンロード��アーカイブをインストール����。"
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
+"APT � <command>dselect</command> メソッド� <command>dselect</command> パッ"
+"ケージ�択 GUI を使��完全� APT システムを�供���。インストールや削除�"
+"るパッケージ��択�� <command>dselect</command> を使��実際�インストール"
+"� APT �行���。"
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:198
+"APT メソッドを有効��る���<command>dselect</command> �アクセス(a) を�択"
+"���れ�ら APT メソッドを�択�る必���り��。���る�アーカイブ��得"
+"先�場所��る<emphasis>ソース</emphasis>群を��れ��。�れ��リモート�イ"
+"ンター�ットサイトやローカル� Debian ミラー�CD-ROM を指定����。�ソース"
+"� Debian アーカイブ全体����一部を�供���APT �自動的�組�����"
+"パッケージ群一�を構����。CD-ROM ��る場�����れを指定���れ�らミ"
+"ラーを指定�る��良�方法�����る���最新��グ修正�アクセス��るよ"
+"���り��。APT �インター�ット�らダウンロード�る�� CD-ROM ��るパッ"
+"ケージを自動的�利用���。"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
-msgstr "   "
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
+msgstr ""
+"   ディストリビューションソース�置一覧�準備\n"
+"\n"
+" Debian ディストリビューション�基底 URL を指定������。\n"
+" �識��るアクセス方法: http file\n"
+"\n"
+" 例:\n"
+"      file:/mnt/debian,\n"
+"      ftp://ftp.debian.org/debian,\n"
+"      http://ftp.de.debian.org/debian,\n"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
+"<emphasis>ソース</emphasis>�準備�基礎��る Debian アーカイブ�質��ら始�"
+"り�デフォルト� HTTP ミラー�������。��次��得�るディストリビュー"
+"ションを質����。"
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-msgstr " "
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
+" �得�るディストリビューション�タグやパッケージファイル��パスを\n"
+" / �終�る形��指定������。ディストリビューション�タグ��\n"
+" 以下�よ��も���り��: stable unstable testing non-US\n"
+"\n"
+" ディストリビューション [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"ディストリビューション�アーカイブ中� Debian �ージョンを�照��"
+"<emphasis>stable</emphasis> �最新�リリース版を�<emphasis>unstable</"
+"emphasis> �開発版を�照���。<emphasis>non-US</emphasis> �一部�ミラー�"
+"��利用�能���衆国�ら�輸出�����暗�化技術��他�も�を�録�る"
+"パッケージを�照���。��������パッケージ��衆国��輸入��法�"
+"�。"
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
-msgstr " "
+"\n"
+" Components [main contrib non-free]:\n"
+msgstr ""
+" �得�るコン�ー�ントを指定������\n"
+" コン�ー�ント��以下�よ��も���り��: main contrib non-free\n"
+"\n"
+" コン�ー�ント [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
 "packages while contrib and non-free contain things that have various "
 "restrictions placed on their use and distribution."
 msgstr ""
+"コン�ー�ント一覧��得�るサブディストリビューション�一覧を�照���。�"
+"�ディストリビューション�ソフトウェア�ライセンスを基���分�られ���"
+"�。main ��る�� DFSG フリー�パッケージ��� contrib や non-free ��利"
+"用目的や�布形態�様々�制�を課�られ��るも���録�れ����。"
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
+"ソース���ら�も追加����。準備スクリプト�必��ソースを全�指定�る�"
+"���続���。"
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
+"<command>dselect</command> を使���メニュー�ら更新(u)を�択��利用�能�"
+"パッケージ一覧を更新�る必���り��。�れ� <literal>apt-get update</"
+"literal> �上�集����得��情報を <command>dselect</command> �ら利用��"
+"るよ�����。以�� <literal>apt-get update</literal> を実行����も更新"
+"(u)を実行�る必���り��。"
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
 "[R]emove commands have no meaning, the [I]nstall command performs both of "
 "them together."
 msgstr ""
+"��後��択(s)を使���択��導入(i)を使��インストール���。APT メソッ"
+"ドを使���る場��設定(c)や削除(r)コマンド��味����導入(i)コマンド��"
+"�両方を実行���。"
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
+"デフォルト� APT �インストール��功��パッケージ (.deb) ファイルを自動的�"
+"削除���。��挙動を変更�る�� /etc/apt/apt.conf 中� <literal>Dselect::"
+"clean \"prompt\";</literal> �記述���。"
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "インターフェース"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"<command>dselect</command> メソッド�実際� <command>apt-get</command> �対�"
+"るラッパースクリプト群��。��メソッド�� <command>apt-get</command> �体"
+"�存在���る以上�機能を実際��供�����。"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
+"APT � <command>dselect</command> メソッド� <command>apt-get</command> �共"
+"��一�インターフェイスを共有�����。通常�行�内容を告知��実行�る簡"
+"��システム��。<placeholder type=\"footnote\" id=\"0\"/> 実行内容����"
+"を告知��後 APT ��考��る状態メッセージを��ら�表示�る����れ�ら�"
+"進ん��る����る��残り作業��れ�ら��る��見�もる�����るよ�"
+"�������。"
 
-#. type: <heading></heading>
-#: guide.sgml:280
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "スタートアップ"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
+"update 以外��らゆる�作��APT �����処�を行�内部状態を準備���。�"
+"��システム�状態����も��ら�確����。��処�� <literal>apt-get "
+"check</literal> �より���も実行����。"
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
 "If some of the package files are not found then they will be ignored and a "
 "warning will be printed when apt-get exits."
 msgstr ""
+"�れ�最��行���パッケージファイルを全�メモリ�読�込む����。APT �"
+"キャッシュを使�よ������る�����処��次�実行�る����早�終�"
+"り��。見��られ��パッケージファイル��る場��無視�れ�apt-get 終了時"
+"�注�を表示���。"
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
+"最後�処��システム��存関係�詳細�分���。インストール��る��展開�"
+"れ�パッケージ��存関係を全�確����題���判断���。�題�見����"
+"場��報告��<command>apt-get</command> �実行を拒����。"
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -8650,14 +8805,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
@@ -8666,17 +8821,17 @@ msgstr ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -8684,62 +8839,97 @@ msgid ""
 "that are unmet. A short explanation of why the package has a dependency "
 "problem is also included."
 msgstr ""
+"��例��システム� libreadlineg2 �関�る�大��題を���多数��題��り"
+"��。未解決��存関係��れ��パッケージ�����パッケージ��題��る�"
+"�を示��併��未解決��存関係を1行�出力���。��パッケージ��存�題�"
+"�由����簡潔�説明も添�られ��。"
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
 msgid ""
-"There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
 msgstr ""
+"APT ��れ�も既知��存関係を全�検討��パッケージ�壊れ�状態��る��を"
+"回��よ�����。"
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
-"The second situation is much less serious than the first because APT places "
-"certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"There are two ways a system can get into a broken state like this. The first "
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
+"システム���よ��壊れ�状態��る原因�2��り��。1�目�アップグレード"
+"実行時�パッケージ間�難解��存関係を <command>dpkg</command> ���ら�欠�"
+"��る���より��。<placeholder type=\"footnote\" id=\"0\"/>2�目�パッ"
+"ケージ�インストール処�中�何�失敗��場���。��状����存�るパッ"
+"ケージ�インストール�れ����パッケージ�展開�れ��る�能性��り��。"
 
-#. type: <p></p>
-#: guide.sgml:351
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"The second situation is much less serious than the first because APT places "
+"certain constraints on the order that packages are installed. In both cases "
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
+msgstr ""
+"APT �パッケージ�インストール順��特定�制約を設���る���より2�目�状"
+"��1�目�状��比���大��ら���り��。��ら�場��も <command>apt-"
+"get</command> � <literal>-f</literal> オプションを指定�る��� APT �解決"
+"方法を推測��処�を続���。APT <command>dselect</command> メソッド��常"
+"� <literal>-f</literal> オプションを有効����メンテナスクリプト���題�"
+"起��場��も簡��処�を継続��るよ�������。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"����1�目�状��より�大�壊れ方�����るシステム�修正� <literal>-"
+"f</literal> オプションを使��場��インストール����失敗��る��インス"
+"トール順�������る�能性��り��。��ら�場�も�APT �処�を�分�"
+"進�られる�����手作業�より dpkg を使�� (�ら�強制�るオプションを指"
+"定��) 状�を修正�る必���り��。"
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "状態レ�ート"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
+"処�を続�る�� <command>apt-get</command> �実行�よ���る処�����報"
+"告���。通常��報告�実行�れる�作�種類を�映��も���り����一般"
+"的�素������り��。��場��も��処�一覧�最終的�状態を示��"
+"<literal>-f</literal> オプション��他�実行�れるコマンド�関連�る動作を考"
+"慮��も���り��。"
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "追加パッケージリスト"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -8747,156 +8937,178 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "The following extra packages will be installed:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
+"追加パッケージリスト�コマンドライン�指示��以外�インストールやアップグ"
+"レード�れるパッケージを全�表示���。�れ� <literal>install</literal> コ"
+"マンド�場����生��れ��。一覧�挙�られるパッケージ�自動インストール"
+"��果�よる場��多��り��。"
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "削除�るパッケージ"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:402
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
+msgstr ""
+"削除�るパッケージリスト�システム�ら削除�れるパッケージを全�表示���。"
+"�れ����作�も起�るも������も��失�れる�����よ��注�深�"
+"確������。<literal>-f</literal> オプションを使��場��パッケージ�削"
+"除を伴����特�多��������オプションを指定��場��特�注�を払�"
+"よ��������。��一覧��インストール�中止等�より一部���インス"
+"トール�れ��る���削除�れるパッケージ���れる����り��。"
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "新�パッケージリスト"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""
+"新�パッケージリスト���純��れ�ら起�る��を�通知���。��パッケー"
+"ジ一覧��在システム�インストール�れ��ら��APT 処�後��存在�る���"
+"�り��。"
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "一時固定リスト"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:431
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
+msgstr ""
+"システム全体をアップグレード�る場��新��パッケージ�必�����り既�イ"
+"ンストール�れ��るパッケージ�競��る���パッケージ�新���ージョン�"
+"インストール�����������り��。��場����パッケージ�一時固定"
+"リスト�表示�れ��。��一覧�挙�られ�パッケージをインストール�る最善�"
+"方法� <literal>apt-get install</literal> ��� <command>dselect</command> "
+"を使�����題を解決�る����。"
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "�留パッケージ�警告"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
 "This should only happen during dist-upgrade or install."
 msgstr ""
+"�留�����るパッケージをインストール�るよ�� APT �指示�る��も���"
+"�。��際��留�����るパッケージを変更�る��を警告���。�れ� "
+"dist-upgrade ��� install を指示�������起�������。"
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "最後����"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
-msgstr ""
+msgstr "最後��APT �発生�る全変更����を表示���。"
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -8912,28 +9124,42 @@ msgid ""
 "If a large number of packages are being removed then the value may indicate "
 "the amount of space that will be freed."
 msgstr ""
+"����1行目��純�一覧を全�短�����も���アップグレード�れる (既�"
+"インストール�れ���新���ージョン�利用�能�) パッケージ�数����も"
+"示���。2行目�設定�完了�����パッケージ�数を示��インストールを中止"
+"��場���れ�集計�れる����り��。最終行���インストール�必���"
+"る容���件を示���。最��数値�組�アーカイブファイル�サイズを示��"
+"�。��1�目�数値�リモート�ら�得���る必���る�イト数�2�目�必�"
+"��る全アーカイブ��計サイズを示���。次�数値��在インストール�れ��"
+"るパッケージ�新��インストール��パッケージ�サイズ���を示���。�れ"
+"�処��全�終���後� /usr �消費�れる容����相当���。パッケージを"
+"大��削除�る場��解放�れる容�を示���も�り��。"
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
+"他�報告����-u オプションを使��アップグレード�れるパッケージを表示��"
+"�。�れ���示��例�似�も���。"
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "状態表示"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
+"アーカイブやパッケージファイル�ダウンロード中�APT �状態を示�一連�メッ"
+"セージを表示���。"
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -8942,7 +9168,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -8950,87 +9176,116 @@ msgstr ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
+"APT �ファイル��得を開始�る��最終行�ダウンロード�進�状�を示���"
+"<emphasis>�得</emphasis>�始�る行�表示�れ��。進��最��パーセント値�"
+"全ファイル�対�る�得済��全体��割�を示���。残念��らパッケージファ"
+"イル�サイズ��明��� <literal>apt-get update</literal> ��正確�予測を行"
+"��能性��り��。"
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:524
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
+msgstr ""
+"状態を示�行�次�節��ダウンロードスレッド���1度��繰り返�れ�進行中�"
+"�作や処������有用�情報を��ら�示���。��節��純� "
+"<emphasis>Forking</emphasis> �����る��も�り���場�� OS �ダウン"
+"ロード用�モジュールを読�込ん��る��を示���。[ �後�最��語�履歴�"
+"表示�れ��る�得番���。��次�語�ダウンロード対象����短縮形��。"
+"アーカイブ�場���得中�パッケージ����入り��。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
+msgstr ""
+"�一引用符内�ダウンロード�やり�り�進�を示�有益�文字列��。標準的��"
+"<emphasis>...�接続�����</emphasis>�ら<emphasis>ファイルを待�����"
+"</emphasis>���れ�ら<emphasis>...をダウンロード�����</emphasis>���"
+"<emphasis>...を�開�����</emphasis>��進���。最後�値�リモートサイ"
+"ト�らダウンロード���イト数��。ダウンロード�始�る��れ� "
+"<literal>102/10.2k</literal> �よ��表示�れ���場�10.2キロ�イト���"
+"102�イト��得済���る��を示���。�計サイズ�常�4ケタ�表示�れ�表"
+"示空間を��よ��������。サイズ表示�後���ファイル自体�進�状�を"
+"百分率�示��も���。��2�後�瞬間的�平�速度��。��値�5秒���更"
+"新�れ���間�データ転�速度を�映���。最後�推定転�時間を表示����"
+"�。�れ�定期的�更新�れ�表示���る転�速度�全�完了�る時間を表示��"
+"�。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
+"状態表示�0.5秒���更新��ダウンロード�進�状�を絶��通知���得行�新"
+"��ファイル�処��始�る����れ�����。状態表示�絶��更新�れる�"
+"�ファイル��記録������ん。<literal>-q</literal> オプションを使��状"
+"態を表示���よ������。"
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT �アーカイブ�インストール� <command>dpkg</command> を使��ダウンロード"
+"�完了後� <command>dpkg</command> インターフェイス�切り替�り��。"
+"<command>dpkg</command> もパッケージ�処�中�����質���パッケージ自体"
+"も複数質��る�も�れ��ん。通常�れ�れ�質�����れ�何を����る�"
+"�説明���。��質��内容�多����るも���り����説明��るも��"
+"�全��り��ん。"
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "オフライン�� APT �使用法"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9038,32 +9293,38 @@ msgstr ""
 "��ドキュメント��ットワーク���環境�� APT �使用方法を説明�����。"
 "具体的���アップグレード時�「スニーカー�ット�アプロー���。"
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "����"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "概�"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
 "machine is on a slow link, such as a modem and another machine has a very "
 "fast connection but they are physically distant."
 msgstr ""
+"通常 APT � Debian アーカイブ��ローカルメディア�ら��る���ットワーク経"
+"由�直接アクセス��る必���り��。他�よ��る苦情�����る Debian マ"
+"シン�接続�モデム等����低速��別�マシン���常�高速�接続��る�れ"
+"�も物�的������������り��。"
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9071,36 +9332,53 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:57
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
+msgstr ""
+"�れ�対�る解法���� Zip や SuperDisk ディスク����大容�脱��能メ"
+"ディアを使���。�����ディスク� Debian アーカイブ全体を格��る���"
+"分��言���容������ん��ユーザ����必����一部を��る���"
+"分余裕��り��。��考�方� APT を使��必��パッケージ�一覧を生���接"
+"続状態�良好�別�マシンを使����ディスク上��得���。APT を使�る別� "
+"Debian マシンや�完全�異�る OS � wget �よ��ダウンロードツールを使���"
+"も�能��。<emphasis>リモートホスト</emphasis>�パッケージをダウンロード�る"
+"マシン�<emphasis>対象ホスト</emphasis>�接続����る��良���マシン��"
+"考������。"
+
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
 "that the disc should be formated with a filesystem that can handle long file "
 "names such as ext2, fat32 or vfat."
 msgstr ""
+"�れ� APT 設定ファイルを独創的��作�る���実�����。�るディスクを "
+"APT �検索�るよ���る���必須��る���件�アーカイブファイル��。�"
+"�ディスク�長�ファイル�を扱�るファイルシステム�例�� ext2 や fat32�"
+"vfat �フォーマット�る必���る���注�������。"
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "両方�マシン�� APT �使用法"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
 "remote machine to fetch the latest package files and decide which packages "
 "to download. The disk directory structure should look like:"
 msgstr ""
+"APT を両方�マシン�利用��るよ���る最も�純�設定を考���。基本的�考"
+"�方� status ファイル�コピーを��ディスク�置��最新�パッケージファイル"
+"��得やダウンロード�るパッケージ�決定��リモートマシンを使���。��"
+"ディスク�ディレクトリ構造�次�よ���り��:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9110,7 +9388,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9119,33 +9397,42 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "設定ファイル"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
+"設定ファイル�� APT �管�ファイルを��ディスク��存����ディスク上�設"
+"定ファイルを�様�利用�るよ��指示�る必���り��。sources.list ��リ"
+"モートマシン�ら利用�る�切�サイトを指定��status ファイル�<emphasis>対象"
+"ホスト</emphasis>� <emphasis>/var/lib/dpkg/status</emphasis> をコピー��も"
+"�を利用���。ローカルアーカイブを使���る場���� URI を利用�����"
+"������注�������。書��ファイル� URI ��一��。"
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
+"<emphasis>apt.conf</emphasis> �� APT ���ディスクを使�よ���る��必�"
+"�情報を記述��������ん:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9153,10 +9440,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9167,20 +9454,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9191,85 +9478,103 @@ msgstr ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:136
-msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:142
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
+msgstr ""
+"apt.conf � man ページや <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis> ��る見本�設定ファイルを調�る��ら�る詳細��り��。"
+
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
+msgid ""
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
+msgstr ""
+"対象�マシン���行����ディスクをマウント����ディスク� <emphasis>/"
+"var/lib/dpkg/status</emphasis> をコピー�る����。概�����られ��るよ"
+"���ディレクトリ <emphasis>archives/partial/</emphasis> �� "
+"<emphasis>lists/partial/</emphasis> を作��る必�も�る��ょ�。�れ�ら"
+"ディスクをリモートマシン�移動�� sources.list を設定���。リモートマシン"
+"��以下�手順を実行���:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ package ファイルを APT ��得��� ]\n"
 " # apt-get dist-upgrade\n"
-" [ 対象マシンをアップグレード�る��必��パッケージを�APT ��得��� ]"
+" [ 対象マシンをアップグレード�る��必��パッケージを�APT ��得��� ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
+"dist-upgrade コマンド�他�任��標準的� APT コマンド�特� dselect-upgrade "
+"�置���る�������。<emphasis>dselect</emphasis> 等� APT フロントエ"
+"ンドを使���も����。�����れ���択�����ローカルコンピュータ"
+"�やり�り���������題��り��。"
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
+"�れ��対象�マシンをアップグレード�る��必��索引ファイル�アーカイブ�"
+"全���ディスク��録�れ��������り��。ディスクを戻��実行���:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
-" [ キャッシュファイル�ローカルコピーを生���� ]\n"
-" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-" [ も�����他� APT コマンド ]"
+"  [ キャッシュファイル�ローカルコピーを生���� ]\n"
+"  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+"  [ も�����他� APT コマンド ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
+"�切�機能�る����ローカル�ファイルを status ファイル��指定�る必��"
+"�り��。�れ��常�����!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9277,233 +9582,123 @@ msgid ""
 "the local machine - but this may not always be possible. DO NOT copy the "
 "status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
+"dselect を使���る場��disc/status �リモートマシン�何��択�る�更新�"
+"れる�� /var/lib/dpkg/status �コピー�る���常��険��。�択�ローカル"
+"マシン���行���を強�勧��� - ����れ�常��能����り��ん。"
+"dpkg や APT を実行���る間� status ファイルをコピー *��������* !!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
-msgstr "APT � wget �使用法"
+msgstr "APT � wget �使用"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
+"<emphasis>wget</emphasis> �人気��る移�性�高�ダウンロードツール����"
+"�らゆるマシン�実行����。上記�方法��異�り��れ��利用�能�パッ"
+"ケージ�一覧を Debian マシン�用�����必���り��。"
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
 "option to apt-get and then preparing a wget script to actually fetch the "
 "packages."
 msgstr ""
+"基本的�考�方��リモートサイト�らダウンロード��アーカイブファイル��を"
+"�録��ディスクを作��る�������。�れ� apt-get � --print-uris オプ"
+"ションを使��行���れ�ら wget スクリプトを準備��実際�パッケージを�得"
+"���。"
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "�作"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
 msgstr ""
+"��技��異�り�特別�設定ファイルを必�����ん。標準的� APT コマンドを"
+"�純�使��ファイル一覧を生����。"
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
 msgstr ""
+"dselect-upgrade を������� dist-upgrade 以外�任��コマンドを使��"
+"�。"
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
 "with the current directory as the disc's mount point so as to save the "
 "output on the disc."
 msgstr ""
+"/disc/wget-script ファイル���必��アーカイブを�得�る���実行�る "
+"wget コマンド�一覧を�録�るよ��������。ディスク上�出力を減ら��"
+"����スクリプト��在�ディレクトリを��ディスク�マウント�イント���"
+"実行�るよ��������。"
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "リモートマシン��以下�よ�����。"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ �待�����... ]"
+"  [ �待�����... ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
+"アーカイブ�ダウンロード�終���ディスク� Debian マシン�返���る�イン"
+"ストールを続�られるよ���り��。"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 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"
-
-#~ msgid "&apt-commonoptions;"
-#~ msgstr "&apt-commonoptions;"
-
-#~ msgid "&file-sourceslist; &file-statelists;"
-#~ msgstr "&file-sourceslist; &file-statelists;"
-
-#~ msgid ""
-#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
-#~ "given one of the commands below must be present.  <placeholder type="
-#~ "\"variablelist\" id=\"0\"/>"
-#~ msgstr ""
-#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
-#~ "��以下�挙�るコマンド�必���。<placeholder type=\"variablelist\" id="
-#~ "\"0\"/>"
-
-#~ msgid ""
-#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
-#~ "given one of the commands below must be present."
-#~ msgstr ""
-#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
-#~ "��以下�挙�るコマンド�必���。"
-
-#~ msgid "Dir Section"
-#~ msgstr "Dir セクション"
-
-#~ msgid "Default Section"
-#~ msgstr "Default セクション"
-
-#~ msgid "TreeDefault Section"
-#~ msgstr "TreeDefault セクション"
-
-#~ msgid "Tree Section"
-#~ msgstr "Tree セクション"
-
-#~ msgid ""
-#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-#~ "&file-statelists;"
-#~ msgstr ""
-#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-#~ "&file-statelists;"
-
-#~ msgid "&file-trustedgpg;"
-#~ msgstr "&file-trustedgpg;"
+msgstr "�れ��ディスク��る�得済��アーカイブを使用�るよ���り��。"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 36c6eedfb..b0a6514b9 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-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 13:59+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -657,37 +657,37 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"id_klucza\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: 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
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: 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
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Opis"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -696,7 +696,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -705,7 +705,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
@@ -713,7 +713,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:64
+#: apt.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
@@ -726,7 +726,7 @@ msgstr ""
 "danego pakietu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
@@ -734,7 +734,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -752,7 +752,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -766,14 +766,14 @@ msgstr ""
 "pakiet zostanie zainstalowany zamiast zostać usunięty."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 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
+#: apt.8.xml:95
 #, fuzzy
 #| msgid ""
 #| "<literal>showhold</literal> is used to print a list of packages on hold "
@@ -786,16 +786,16 @@ msgstr ""
 "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
+#: apt.8.xml:101
 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."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 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 "
@@ -803,19 +803,19 @@ msgid ""
 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
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 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 "
@@ -825,12 +825,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 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 "
@@ -838,28 +838,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 #, 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
+#: apt.8.xml:151
 #, 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
+#: apt.8.xml:155
 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
+#: apt.8.xml:160
 #, fuzzy
 #| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
@@ -868,17 +868,17 @@ msgid ""
 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
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "Zobacz także"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -893,15 +893,15 @@ msgstr ""
 "&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
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "Diagnostyka"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
@@ -915,12 +915,12 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 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
+#: apt-get.8.xml:35
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> is the command-line tool for handling "
@@ -940,8 +940,8 @@ msgstr ""
 
 #
 #. 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
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -951,7 +951,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -976,7 +976,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -1002,7 +1002,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1028,7 +1028,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1046,7 +1046,7 @@ msgstr ""
 "nowych)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -1077,7 +1077,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1087,7 +1087,7 @@ msgstr ""
 "ostrożnie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -1108,7 +1108,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1118,7 +1118,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -1139,7 +1139,7 @@ msgstr ""
 "lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1151,7 +1151,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1171,7 +1171,7 @@ msgstr ""
 "wydanie</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1187,7 +1187,7 @@ msgstr ""
 "możliwe pobranie jakiejkolwiek wersji pakietu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1203,7 +1203,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -1218,7 +1218,7 @@ msgstr ""
 "włączona zostaje opcja <literal>APT::Get::Only-Source</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1230,7 +1230,7 @@ msgstr ""
 "<command>tar</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1244,7 +1244,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1253,7 +1253,7 @@ msgstr ""
 "bufor (cache) pakietów i szuka zepsutych pakietów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1263,7 +1263,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 #, fuzzy
 #| msgid ""
 #| "<literal>clean</literal> clears out the local repository of retrieved "
@@ -1289,7 +1289,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1309,7 +1309,7 @@ msgstr ""
 "zawierajÄ…cych zainstalowane pakiety."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1320,7 +1320,7 @@ msgstr ""
 "pakietach, i nie są już potrzebne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1343,7 +1343,7 @@ msgstr ""
 "te dla polecenia <option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1352,7 +1352,7 @@ msgstr ""
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1362,7 +1362,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1373,7 +1373,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 #, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -1414,7 +1414,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1434,7 +1434,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1446,7 +1446,7 @@ msgstr ""
 "Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1467,7 +1467,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1478,7 +1478,7 @@ msgstr ""
 "Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1498,7 +1498,7 @@ msgstr ""
 "strony <literal>apt-get</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1515,7 +1515,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1531,7 +1531,7 @@ msgstr ""
 "Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1541,7 +1541,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1552,7 +1552,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1561,7 +1561,7 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1587,7 +1587,7 @@ msgstr ""
 "Host-Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1613,7 +1613,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1623,7 +1623,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1637,7 +1637,7 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1650,7 +1650,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1663,7 +1663,7 @@ msgstr ""
 "<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1677,7 +1677,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1694,7 +1694,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1717,7 +1717,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 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. "
@@ -1732,7 +1732,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1741,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:462
+#: apt-get.8.xml:456
 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 "
@@ -1759,7 +1759,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1783,7 +1783,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1798,7 +1798,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1808,7 +1808,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1823,7 +1823,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 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 "
@@ -1843,7 +1843,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 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</"
@@ -1855,7 +1855,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1866,7 +1866,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 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::"
@@ -1877,7 +1877,7 @@ msgstr ""
 "w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1887,14 +1887,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Pliki"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1911,7 +1911,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1920,13 +1920,13 @@ msgstr ""
 "w przypadku błędu."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "odpytanie bufora APT"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1939,7 +1939,7 @@ msgstr ""
 "generowania interesującego wyjścia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1949,15 +1949,15 @@ msgstr ""
 "istnieje lub jest przestarzały."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1980,7 +1980,7 @@ msgstr ""
 "poniższego:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -2007,7 +2007,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -2027,7 +2027,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -2037,7 +2037,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -2047,7 +2047,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -2060,7 +2060,7 @@ msgstr ""
 "pakiety jako zależności.  Większość pakietów należy do tej kategorii."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -2077,7 +2077,7 @@ msgstr ""
 "agenta\", ale żaden pakiet nie nazywa się \"mail-transport-agent\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2091,7 +2091,7 @@ msgstr ""
 "dostarcza \"X11-text-viewer\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2106,7 +2106,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2122,7 +2122,7 @@ msgstr ""
 "zależnościach typu \"Conflicts\" lub \"Breaks\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -2139,7 +2139,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2148,7 +2148,7 @@ msgstr ""
 "więzów zależności wymaganych przez wszystkie pakiety w buforze."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2161,7 +2161,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2171,7 +2171,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2182,7 +2182,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2192,7 +2192,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2201,12 +2201,12 @@ msgstr ""
 "avail</command>; pokazuje szczegółowe informacje o podanych pakietach."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2229,7 +2229,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2239,7 +2239,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2249,7 +2249,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2258,13 +2258,13 @@ msgstr ""
 "danego pakietu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -2279,7 +2279,7 @@ msgstr ""
 "używać z opcją <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -2292,7 +2292,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2313,7 +2313,7 @@ msgstr ""
 "Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2328,12 +2328,12 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2343,13 +2343,13 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -2363,7 +2363,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -2382,7 +2382,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2394,7 +2394,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2411,7 +2411,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2425,7 +2425,7 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2437,7 +2437,7 @@ msgstr ""
 "Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2453,7 +2453,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2462,7 +2462,7 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2481,7 +2481,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2494,7 +2494,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2504,7 +2504,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2517,7 +2517,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2530,7 +2530,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2542,13 +2542,13 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2558,12 +2558,12 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "Narzędzie zarządzanie kluczami APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -2575,12 +2575,12 @@ msgstr ""
 "zaufane."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Polecenia"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2591,32 +2591,32 @@ msgstr ""
 "wejścia, jeśli zamiast nazwy pliku podano <literal>-</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "Usuwa klucz z listy zaufanych kluczy."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Wyświetla klucz &synopsis-param-keyid; na standardowym wyjściu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "Wypisuje na standardowe wyjście wszystkie zaufane klucze."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "Wyświetla listę zaufanych kluczy."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "Wyświetla listę odcisków zaufanych kluczy."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2625,7 +2625,7 @@ msgstr ""
 "pobranie klucza publicznego."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2639,7 +2639,7 @@ msgstr ""
 "distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2657,12 +2657,12 @@ msgstr ""
 "command>, ale APT w Ubuntu je obsługuje."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Opcje"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2671,7 +2671,7 @@ msgstr ""
 "opisanymi w poprzednim rozdziale."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2688,47 +2688,47 @@ msgstr ""
 "właśnie tam."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "Lokalna składnica zaufanych kluczy archiwum."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Składnica zaufanych kluczy archiwum &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr "Składnica usuniętych zaufanych kluczy archiwum &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2737,7 +2737,7 @@ msgstr ""
 "zainstalowany automatycznie."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -2753,7 +2753,7 @@ msgstr ""
 "lub <command>aptitude</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2764,7 +2764,7 @@ msgstr ""
 "żaden inny ręcznie zainstalowany pakiet nie będzie od niego zależał."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2775,7 +2775,7 @@ msgstr ""
 "sytuacji gdy żaden inny pakiet nie będzie od niego zależał."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2790,7 +2790,7 @@ msgstr ""
 "działanie tego polecenia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2800,7 +2800,7 @@ msgstr ""
 "na tym pakiecie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2814,7 +2814,7 @@ msgstr ""
 "to zostaną wypisane tylko te z nich, które są automatycznie zainstalowane."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2825,7 +2825,7 @@ msgstr ""
 "zainstalowanych pakietów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2834,7 +2834,7 @@ msgstr ""
 "pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2848,7 +2848,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2857,12 +2857,12 @@ msgstr ""
 "wartość niezerową - w przypadku błędu."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "Wsparcie APT dla autentykacji archiwum."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -2875,7 +2875,7 @@ msgstr ""
 "używanego do podpisywania plików \"Release\"."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 msgid ""
 "If a package comes from a archive without a signature, or with a signature "
 "that apt does not have a key for, that package is considered untrusted, and "
@@ -2891,7 +2891,7 @@ msgstr ""
 "zweryfikowane, zanim w ogóle APT spróbuje z nich pobrać pakiety."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2900,12 +2900,12 @@ msgstr ""
 "sposób autoryzacji pakietów."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Zaufane archiwa"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2921,7 +2921,7 @@ msgstr ""
 "opiekuna archiwum jest zapewnienie poprawności integralności archiwum."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2934,7 +2934,7 @@ msgstr ""
 "verify i devscripts)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. In order to become "
@@ -2951,7 +2951,7 @@ msgstr ""
 "odpowiednie procedury używane w Debianie do identyfikacji posiadacza klucza."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2973,7 +2973,7 @@ msgstr ""
 "&keyring-package;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2984,7 +2984,7 @@ msgstr ""
 "pakietu. Mogą też polegać na tym, że APT zrobi to automatycznie."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2994,7 +2994,7 @@ msgstr ""
 "dwoma możliwymi typami ataków:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -3011,7 +3011,7 @@ msgstr ""
 "\"ARP (DNS) spoofing\")."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -3025,7 +3025,7 @@ msgstr ""
 "pobierajÄ…cym pakiety z tego serwera."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -3038,12 +3038,12 @@ msgstr ""
 "dla sprawdzania sygnatur poszczególnych pakietów."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Konfiguracja użytkownika"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys, although an installation of "
@@ -3057,7 +3057,7 @@ msgstr ""
 "Debiana."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -3073,19 +3073,19 @@ msgstr ""
 "<filename>Release.gpg</filename> ze skonfigurowanych archiwów."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Konfiguracja archiwum"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr "Aby dołączyć sygnatury do archiwum, którym się opiekujesz, należy:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -3096,7 +3096,7 @@ msgstr ""
 "release</command> (dostarczanego w pakiecie apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -3107,7 +3107,7 @@ msgstr ""
 "o Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -3118,7 +3118,7 @@ msgstr ""
 "autoryzować plików w archiwum."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3128,16 +3128,16 @@ msgstr ""
 "opiekun archiwum musi wykonać pierwsze dwa z wymienionych powyżej kroków."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3153,12 +3153,12 @@ msgstr ""
 "Distribution HOWTO</ulink>\" napisanym przez V. Alexa Brennena."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Autorzy strony podręcznika"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -3169,13 +3169,13 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "Narzędzie APT do zarządzania źródłami typu CD-ROM"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3189,7 +3189,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -3200,7 +3200,7 @@ msgstr ""
 "w wielodyskowym archiwum musi być włożony i zeskanowany oddzielnie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3216,7 +3216,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3228,7 +3228,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3238,7 +3238,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 #, fuzzy
 #| msgid ""
 #| "Mount point; specify the location to mount the CD-ROM. This mount point "
@@ -3256,7 +3256,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 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.  "
@@ -3269,7 +3269,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3282,7 +3282,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3294,7 +3294,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3309,7 +3309,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3322,7 +3322,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3334,13 +3334,13 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3349,12 +3349,12 @@ msgstr ""
 "- w przypadku błędu."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "Program odpytywania konfiguracji APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3367,7 +3367,7 @@ msgstr ""
 "filename> w sposób łatwy do użycia w programach skryptowych."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -3382,7 +3382,7 @@ msgstr ""
 "Przykład użycia w skrypcie powłoki:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3394,7 +3394,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3403,7 +3403,7 @@ msgstr ""
 "zmiennej MojaAplikacja::opcje, z domyślną wartością <option>-f</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -3414,12 +3414,12 @@ msgstr ""
 "jest ujednolicana i weryfikowana."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Wyświetla zawartość przestrzeni konfiguracji."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3428,12 +3428,12 @@ msgstr ""
 "użyć <literal>--no-empty</literal>, aby usunąć takie opcje z wyjścia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3452,14 +3452,14 @@ msgstr ""
 "używając &percnt;&percnt;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3468,27 +3468,27 @@ msgstr ""
 "- w przypadku błędu."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Wstępna dokumentacja hierarchii Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "Plik konfiguracyjny dla APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3502,7 +3502,7 @@ msgstr ""
 "jednolite środowisko pracy."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3511,7 +3511,7 @@ msgstr ""
 "następującym porządku:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3520,7 +3520,7 @@ msgstr ""
 "ustawiona)."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3540,14 +3540,14 @@ msgstr ""
 "żadnych informacji."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 "główny plik konfiguracyjny określony przez <literal>Dir::Etc::main</literal>."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3556,12 +3556,12 @@ msgstr ""
 "załadowania kolejnych plików konfiguracyjnych."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Składnia"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3576,7 +3576,7 @@ msgstr ""
 "dziedziczą ustawień od swoich przodków."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3591,7 +3591,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3609,7 +3609,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -3617,27 +3617,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3647,7 +3647,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3659,7 +3659,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3669,7 +3669,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3681,7 +3681,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3698,19 +3698,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3718,7 +3718,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3731,7 +3731,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3740,7 +3740,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3749,14 +3749,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 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:201
+#: apt.conf.5.xml:195
 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 "
@@ -3765,7 +3765,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 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 "
@@ -3780,7 +3780,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3797,7 +3797,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 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 "
@@ -3808,7 +3808,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 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 "
@@ -3821,7 +3821,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 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 "
@@ -3841,38 +3841,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 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:282
+#: apt.conf.5.xml:276
 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:287
+#: apt.conf.5.xml:281
 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:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3880,7 +3880,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3893,7 +3893,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3905,7 +3905,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3917,7 +3917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3925,7 +3925,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 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 "
@@ -3936,7 +3936,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3946,21 +3946,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 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:364
+#: apt.conf.5.xml:358
 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:369
+#: apt.conf.5.xml:363
 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]/</"
@@ -3972,7 +3972,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 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 "
@@ -3984,14 +3984,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 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:390
+#: apt.conf.5.xml:384
 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."
@@ -4003,14 +4003,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 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:400
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4020,7 +4020,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4028,7 +4028,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 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 "
@@ -4042,7 +4042,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4053,7 +4053,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4075,7 +4075,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 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]/</"
@@ -4094,7 +4094,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4104,7 +4104,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 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 "
@@ -4113,7 +4113,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4123,13 +4123,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4142,20 +4142,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 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:523
+#: apt.conf.5.xml:517
 #, 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:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4167,19 +4167,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, 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:531
+#: apt.conf.5.xml:525
 #, 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:524
+#: apt.conf.5.xml:518
 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 +4197,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, 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:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4218,7 +4218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4226,7 +4226,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4235,7 +4235,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4247,13 +4247,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4275,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4284,22 +4284,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4311,20 +4311,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4334,7 +4335,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4342,7 +4343,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4353,7 +4354,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4366,7 +4367,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4377,12 +4378,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4390,7 +4391,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4403,40 +4404,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 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:682
+#: 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 update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 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:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 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:699
+#: apt.conf.5.xml:694
 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 "
@@ -4444,7 +4445,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4453,7 +4454,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 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 "
@@ -4464,7 +4465,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4473,7 +4474,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4484,7 +4485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4495,26 +4496,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 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:746
+#: apt.conf.5.xml:741
 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:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 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 "
@@ -4529,7 +4530,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4543,7 +4544,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4557,7 +4558,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4570,7 +4571,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4587,7 +4588,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4598,7 +4599,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4608,7 +4609,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4626,7 +4627,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 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 "
@@ -4640,12 +4641,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4654,13 +4655,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 #, fuzzy
 msgid "Debug options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4671,7 +4672,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4679,7 +4680,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4687,7 +4688,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4697,7 +4698,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:877
+#: apt.conf.5.xml:872
 #, fuzzy
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -4707,59 +4708,59 @@ msgstr ""
 "in CDROM IDs."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 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:951
+#: apt.conf.5.xml:946
 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:961
+#: apt.conf.5.xml:956
 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:971
+#: apt.conf.5.xml:966
 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:981
+#: apt.conf.5.xml:976
 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 "
@@ -4767,53 +4768,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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:1004
+#: apt.conf.5.xml:999
 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:1014
+#: apt.conf.5.xml:1009
 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:1024
+#: apt.conf.5.xml:1019
 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:1036
+#: apt.conf.5.xml:1031
 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:1047
+#: apt.conf.5.xml:1042
 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:1058
+#: apt.conf.5.xml:1053
 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:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -4823,7 +4824,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -4841,46 +4842,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 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:1114
+#: apt.conf.5.xml:1109
 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:1125
+#: apt.conf.5.xml:1120
 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:1137
+#: apt.conf.5.xml:1132
 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:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 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:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -4888,14 +4889,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 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
+#: apt.conf.5.xml:1186
 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 "
@@ -4903,13 +4904,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Przykłady"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -4917,17 +4918,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "Plik kontrolny preferencji APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -4939,7 +4940,7 @@ msgstr ""
 "do określania wersji pakietów wybieranych do instalacji."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -4961,7 +4962,7 @@ msgstr ""
 "zainstalowania."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -4976,7 +4977,7 @@ msgstr ""
 "wybór instancji, ale na wybór wersji."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -5001,7 +5002,7 @@ msgstr ""
 "oczekiwało. Ostrzegamy!"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5024,24 +5025,24 @@ msgstr ""
 "komunikat."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "Domyślne przypisania priorytetów APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>jakiÅ›-pakiet</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -5069,7 +5070,7 @@ msgstr ""
 "\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
@@ -5078,12 +5079,12 @@ msgstr ""
 "do ustawiania priorytetów wersjom pakietu. Przypisuje:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "priorytet 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5096,12 +5097,12 @@ msgstr ""
 "<literal>experimental</literal> Debiana."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "priorytet 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5115,30 +5116,30 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "priorytet 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr "wersjom niezainstalowanym i nienależącym do wydania docelowego."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "priorytet 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr "wersjom niezainstalowanym i należącym do wydania docelowego."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -5155,7 +5156,7 @@ msgstr ""
 "100, jeśli dodatkowo są  oznaczone jako \"ButAutomaticUpgrades: yes\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5164,7 +5165,7 @@ msgstr ""
 "następujące reguły wymienione w kolejności, w jakiej są stosowane."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5179,12 +5180,12 @@ msgstr ""
 "Instalowanie wcześniejszych wersji pakietów może być ryzykowną operacją)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "Instaluje wersję o najwyższym priorytecie."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5193,7 +5194,7 @@ msgstr ""
 "wersja nowsza (czyli z większym numerem wersji)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5205,7 +5206,7 @@ msgstr ""
 "niezainstalowany."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5220,7 +5221,7 @@ msgstr ""
 "upgrade</command> zaktualizujÄ… ten pakiet."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5234,7 +5235,7 @@ msgstr ""
 "wersjÄ…."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5252,12 +5253,12 @@ msgstr ""
 "wersji ma większy priorytet niż wersja zainstalowana."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "Efekt stosowania preferencji APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5270,7 +5271,7 @@ msgstr ""
 "przyjmować jedną z dwóch postaci: szczegółową i ogólną."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5287,7 +5288,7 @@ msgstr ""
 "rozdzielajÄ…c je od siebie spacjami."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5299,7 +5300,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -5313,7 +5314,7 @@ msgstr ""
 "strony internetowej identyfikowanej przez pełną nazwę domenową strony."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -5324,7 +5325,7 @@ msgstr ""
 "wszystkim wersjom pakietów dostępnych na lokalnym komputerze."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5336,7 +5337,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -5349,7 +5350,7 @@ msgstr ""
 "identyfikowanym przez nazwÄ™ komputera \"ftp.de.debian.org\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5361,7 +5362,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5376,7 +5377,7 @@ msgstr ""
 "lub \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5387,7 +5388,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5399,7 +5400,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5410,7 +5411,7 @@ msgstr ""
 "\"<literal>&testing-codename;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5422,7 +5423,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5435,7 +5436,7 @@ msgstr ""
 "\"<literal>&stable-version;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5447,12 +5448,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Składnia wyrażeń regularnych i &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -5468,7 +5469,7 @@ msgstr ""
 "POSIX otoczone ukośnikami)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -5480,7 +5481,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -5491,7 +5492,7 @@ msgstr ""
 "pakietom z wydania o nazwie zaczynajÄ…cej siÄ™ od &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5503,7 +5504,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -5522,12 +5523,12 @@ msgstr ""
 "<literal>Package</literal> nie jest uznawany za wyrażenie &glob;."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Jak APT interpretuje priorytety"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -5537,12 +5538,12 @@ msgstr ""
 "rzecz biorÄ…c):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -5551,12 +5552,12 @@ msgstr ""
 "zastąpienie pakietu jego wcześniejszą wersją."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -5565,12 +5566,12 @@ msgstr ""
 "wydania docelowego, chyba że zainstalowana wersja jest nowsza."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -5580,12 +5581,12 @@ msgstr ""
 "zainstalowana."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -5594,12 +5595,12 @@ msgstr ""
 "należąca do innej dystrybucji lub nowsza wersja jest zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -5608,17 +5609,17 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "zapobiega instalowaniu wersji"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -5632,7 +5633,7 @@ msgstr ""
 "określany na podstawie pierwszego z takich rekordów."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -5641,7 +5642,7 @@ msgstr ""
 "wcześniej rekordy:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5669,12 +5670,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Wtedy:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -5690,7 +5691,7 @@ msgstr ""
 "&good-perl;*."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -5701,7 +5702,7 @@ msgstr ""
 "pakietu, włączając w to wersję należącą do wydania docelowego."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -5715,12 +5716,12 @@ msgstr ""
 "nie jest jeszcze zainstalowana."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Określanie wersji pakietu i właściwości dystrybucji"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -5731,7 +5732,7 @@ msgstr ""
 "pakiety dostępne w danej lokalizacji."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -5750,27 +5751,27 @@ msgstr ""
 "priorytetów APT bierze pod uwagę tylko dwie linie z każdego rekordu:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "linia <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "podaje nazwÄ™ pakietu"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "linia <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "podaje numer wersji danego pakietu"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -5793,12 +5794,12 @@ msgstr ""
 "priorytetów APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -5815,18 +5816,18 @@ msgstr ""
 "następujący sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "linia <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -5843,13 +5844,13 @@ msgstr ""
 "następujący sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -5866,7 +5867,7 @@ msgstr ""
 "sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -5878,12 +5879,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "linia <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -5901,18 +5902,18 @@ msgstr ""
 "następujący sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "linia <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -5924,18 +5925,18 @@ msgstr ""
 "można podać w pliku preferencji APT w następujący sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "linia <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -5947,13 +5948,13 @@ msgstr ""
 "podać w pliku preferencji APT w następujący sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -5978,12 +5979,12 @@ msgstr ""
 "dystrybucji <literal>unstable</literal> ."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Opcjonalne linie w rekordzie preferencji APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -5994,12 +5995,12 @@ msgstr ""
 "literal> (tj. objaśnienie). Pozwala to na dodawanie komentarzy do rekordów."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Åšledzenie dystrybucji stabilnej"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6023,7 +6024,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6038,8 +6039,8 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6051,7 +6052,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6064,13 +6065,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6083,12 +6084,12 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Åšledzenie dystrybucji testowej lub niestabilnej"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6116,7 +6117,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6133,7 +6134,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6146,13 +6147,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6172,12 +6173,12 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Åšledzenie ewolucji wydania o danej nazwie kodowej"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6211,7 +6212,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6237,7 +6238,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6250,13 +6251,13 @@ msgstr ""
 "literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6276,17 +6277,17 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "Lista skonfigurowanych źródeł danych APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6304,7 +6305,7 @@ msgstr ""
 "programu użytkowego będącego interfejsem do systemu APT)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6319,12 +6320,12 @@ msgstr ""
 "dalsza część linii stanowi komentarz."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -6346,12 +6347,12 @@ msgstr ""
 "wypisze odpowiedni komunikat."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "Typy deb i deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6377,7 +6378,7 @@ msgstr ""
 "źródłowych."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6386,14 +6387,14 @@ msgstr ""
 "<literal>deb</literal> i <literal>deb-src</literal> jest następujący:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, fuzzy, no-wrap
 #| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ opcje ] uri dystrybucja [komponent1] [komponent2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6416,14 +6417,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 #, fuzzy
 #| msgid ""
 #| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -6454,7 +6455,7 @@ msgstr ""
 "<literal>komponent</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 #, fuzzy
 #| msgid ""
 #| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -6483,7 +6484,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 #, fuzzy
 #| msgid ""
 #| "Since only one distribution can be specified per line it may be necessary "
@@ -6524,7 +6525,7 @@ msgstr ""
 "sieciach o niskiej przepustowości łączy."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -6541,7 +6542,7 @@ msgstr ""
 "wypisywania żadnego ostrzeżenia):"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -6556,7 +6557,7 @@ msgstr ""
 "w opcji konfiguracji <literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 #, fuzzy
 #| msgid ""
 #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6577,7 +6578,7 @@ msgstr ""
 "w opcji konfiguracji <literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -6595,7 +6596,7 @@ msgstr ""
 "niezautentykowane."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -6609,12 +6610,12 @@ msgstr ""
 "komputerami w Internecie)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Kilka przykładów:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6626,17 +6627,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "Określanie URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "Obecnie rozpoznawane są następujące typy URI:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6647,7 +6648,7 @@ msgstr ""
 "archiwów."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6657,7 +6658,7 @@ msgstr ""
 "list."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6674,7 +6675,7 @@ msgstr ""
 "bezpieczny."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6694,7 +6695,7 @@ msgstr ""
 "konfiguracyjnym serwery proxy  używające HTTP zostaną zignorowane."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -6707,7 +6708,7 @@ msgstr ""
 "do skopiowania plików przy użyciu APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6721,12 +6722,12 @@ msgstr ""
 "przetransferowania plików ze zdalnego komputera."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "dodawanie innych rozpoznawanych typów URI"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -6745,7 +6746,7 @@ msgstr ""
 "zobaczyć &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -6754,36 +6755,36 @@ msgstr ""
 "debian dla zasobów stable/main, stable/contrib i stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "Linie źródeł dla powyższego przykładu"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6794,7 +6795,7 @@ msgstr ""
 "literal> i <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -6804,7 +6805,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -6813,13 +6814,13 @@ msgstr ""
 "org i dystrybucji hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -6828,13 +6829,13 @@ msgstr ""
 "katalogu debian i używa tylko dystrybucji &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -6847,19 +6848,19 @@ msgstr ""
 "to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -6878,17 +6879,17 @@ msgstr ""
 "nie zawiera takiej struktury). <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache;, &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -6897,7 +6898,7 @@ msgstr ""
 "<command>debconf</command>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -6911,12 +6912,12 @@ msgstr ""
 "te skrypty i szablony, zostanie wypisana linia w następującym formacie:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "pakiet wersja plik-template skrypt-config"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -6931,7 +6932,7 @@ msgstr ""
 "config.XXXXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -6943,7 +6944,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -6953,12 +6954,12 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "Narzędzie użytkowe do sortowania plików indeksu"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -6970,7 +6971,7 @@ msgstr ""
 "zgodnie z wewnętrznymi zasadami sortowania."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -6979,7 +6980,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -6989,7 +6990,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -6998,12 +6999,12 @@ msgstr ""
 "100 - w przypadku błędu."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "Narzędzie użytkowe do generowania plików indeksu"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -7016,7 +7017,7 @@ msgstr ""
 "on the content of that site."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7026,7 +7027,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -7036,7 +7037,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7045,13 +7046,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7060,7 +7061,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -7068,7 +7069,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7079,7 +7080,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7094,7 +7095,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7107,7 +7108,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -7117,20 +7118,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 #, fuzzy
 msgid "The Generate Configuration"
 msgstr "Plik konfiguracyjny"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7141,20 +7142,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 #, fuzzy
 #| msgid "the <literal>Origin:</literal> line"
 msgid "<literal>Dir</literal> Section"
 msgstr "linia <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7163,7 +7164,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -7171,31 +7172,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 #, fuzzy
 #| msgid "the <literal>Label:</literal> line"
 msgid "<literal>Default</literal> Section"
 msgstr "linia <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7203,7 +7204,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -7212,42 +7213,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7255,14 +7256,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7270,14 +7271,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 #, fuzzy
 #| msgid "the <literal>Label:</literal> line"
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "linia <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7285,7 +7286,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -7293,7 +7294,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -7304,35 +7305,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7340,7 +7341,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -7348,7 +7349,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -7358,19 +7359,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -7378,7 +7379,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -7387,14 +7388,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 #, fuzzy
 #| msgid "the <literal>Label:</literal> line"
 msgid "<literal>Tree</literal> Section"
 msgstr "linia <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -7404,7 +7405,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -7413,7 +7414,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -7421,7 +7422,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -7435,7 +7436,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -7443,7 +7444,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -7451,7 +7452,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -7459,38 +7460,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 #, fuzzy
 #| msgid "the <literal>Component:</literal> line"
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "linia <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -7500,55 +7501,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "Określa plik zawierający listę plików."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 #, fuzzy
 msgid "The Binary Override File"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -7558,19 +7559,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -7581,13 +7582,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 #, fuzzy
 msgid "The Source Override File"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -7595,12 +7596,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -7608,7 +7609,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -7623,7 +7624,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 #, fuzzy
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
@@ -7634,7 +7635,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -7649,7 +7650,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 #, fuzzy
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@ -7663,7 +7664,7 @@ msgstr ""
 "<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -7674,7 +7675,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 #, fuzzy
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
@@ -7687,7 +7688,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 #, fuzzy
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
@@ -7697,7 +7698,7 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 #, fuzzy
 #| msgid ""
 #| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -7717,7 +7718,7 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -7731,7 +7732,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -7741,13 +7742,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -7755,7 +7756,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7763,34 +7764,51 @@ msgstr ""
 "<command>apt-ftparchive</command> zwraca zero, gdy zakończyło się pomyślnie, "
 "100 - w przypadku błędu."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "pl"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "Podręcznik użytkownika APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr "Dokument zawiera opis używania menadżera pakietów APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -7803,8 +7821,8 @@ msgstr ""
 "\" (GNU General Public License) publikowanej przez \"FundacjÄ™ Wolnego "
 "Oprogramowania (Free Software Foundation)."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -7812,31 +7830,31 @@ msgstr ""
 "Więcej szczegółów można uzyskać, przeglądając plik zawierający pełen tekst "
 "licencji (w systemach Debian jest to plik /usr/share/common-licenses/GPL)."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "Ogólne"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"Pakiet APT składa się z dwóch części: z metody APT programu <prgn>dselect</"
-"prgn> oraz z programu <prgn>apt-get</prgn> będącego interfejsem linii "
-"poleceń. Obie części pozwalają na instalowanie i usuwanie pakietów oraz na "
-"pobieranie nowych pakietów z Internetu."
+"Pakiet APT składa się z dwóch części: z metody APT programu "
+"<command>dselect</command> oraz z programu <command>apt-get</command> "
+"będącego interfejsem linii poleceń. Obie części pozwalają na instalowanie i "
+"usuwanie pakietów oraz na pobieranie nowych pakietów z Internetu."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Budowa systemu pakietów"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -7846,8 +7864,8 @@ msgstr ""
 "pakietem, zapewniających integralność pakietów w systemie. Najbardziej "
 "widoczną cechą systemu pakietów jest system zależności."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -7861,8 +7879,8 @@ msgstr ""
 "liczbę pakietów instalowanych przez przeciętnego użytkownika. Pozwala także "
 "wybierać programy odpowiedzialne za dostarczanie poczty, serwery X-ów itp."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -7873,8 +7891,8 @@ msgstr ""
 "zrozumienie koncepcji prostej zależności. Prosta zależność oznacza, że dany "
 "pakiet do poprawnego działania wymaga zainstalowania innego pakietu."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -7887,8 +7905,8 @@ msgstr ""
 "GPG. Ma także prostą zależność od pakietu emacs, ponieważ jest rozszerzeniem "
 "emacsa, więc i bez emacsa jest równie bezużyteczny."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -7910,8 +7928,8 @@ msgstr ""
 "są w konflikcie ze wszystkimi innymi programami obsługującymi dostarczanie "
 "poczty."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -7932,8 +7950,8 @@ msgstr ""
 "obsługi poczty. Może to być bardzo mylące podczas próby ręcznego naprawiania "
 "zależności pakietów."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -7944,77 +7962,85 @@ msgstr ""
 "obecnie zainstalowane pakiety. ATP próbuje rozwiązać zależności używając "
 "pewnej liczby algorytmów pomagających w wyborze pakietów do zainstalowania."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> dostarcza prostego sposobu na zainstalowanie pakietów z "
-"linii poleceń. W przeciwieństwie do <prgn>dpkg</prgn>, <prgn>apt-get</prgn> "
-"nie posługuje się nazwami plików \".deb\", lecz używa nazw pakietów i może "
-"zainstalować tylko archiwa \".deb\" ze skonfigurowanych <em>źródeł</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw "
-"ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</"
-"p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest "
-"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources."
-"list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za "
-"pomocą polecenia <tt>apt-get update</tt>. Na przykład:"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> dostarcza prostego sposobu na zainstalowanie "
+"pakietów z linii poleceń. W przeciwieństwie do <command>dpkg</command>, "
+"<command>apt-get</command> nie posługuje się nazwami plików \".deb\", lecz "
+"używa nazw pakietów i może zainstalować tylko archiwa \".deb\" ze "
+"skonfigurowanych <emphasis>źródeł</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Aby używać serwera proxy, należy najpierw ustawić zmienną środowiskową "
+"http_proxy, proszę przeczytać sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"Pierwszą rzeczą <placeholder type=\"footnote\" id=\"0\"/>, którą należy "
+"zrobić przed użyciem <command>apt-get</command> jest pobranie listy pakietów "
+"(ze <emphasis>źródeł</emphasis> wymienionych w pliku sources.list(5)), tak "
+"żeby APT wiedział, jakie pakiety są dostępne. Robi się to za pomocą "
+"polecenia <literal>apt-get update</literal>. Na przykład:"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Pob: http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Pob: http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Czytanie list pakietów... Gotowe\n"
-"Budowanie drzewa zależności.. Gotowe"
+"Budowanie drzewa zależności... Gotowe\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr "Po zaktualizowaniu można użyć następnych poleceń:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "Upgrade spróbuje delikatnie zaktualizować cały system. Upgrade nigdy nie "
 "zainstaluje nowego pakietu ani nie usunie istniejącego pakiety, ani też nie "
@@ -8023,15 +8049,16 @@ msgstr ""
 "aktualizacji systemu. Upgrade wypisze listę pakietów, których nie potrafił "
 "zaktualizować, co zazwyczaj oznacza, że zależą one od nowych pakietów lub są "
 "w konflikcie z innymi pakietami. Można wymusić instalację takich pakietów, "
-"używając do tego <prgn>dselect</prgn> lub <tt>apt-get install</tt>."
+"używając do tego <command>dselect</command> lub <literal>apt-get install</"
+"literal>."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8050,21 +8077,22 @@ msgstr ""
 "wypisze podsumowanie i poprosi o potwierdzenie, jeśli zamierza zmienić "
 "cokolwiek innego niż pakiety podane jako jego argumenty."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "Dist-upgrade powoduje całkowitą aktualizację systemu i jest zaprojektowany "
 "do uproszczenia aktualizacji z jednego wydania Debiana do kolejnego. Używa "
@@ -8072,11 +8100,12 @@ msgstr ""
 "zainstalowania, aktualizacji lub usunięcia, tak aby zaktualizować jak "
 "najwięcej pakietów w systemie do nowszego wydania. W niektórych sytuacjach, "
 "może być prościej użyć dist-upgrade niż ręcznie rozwiązywać zależności w "
-"programie <prgn>dselect</prgn>. Kiedy dist-upgrade zakończy działanie, można "
-"użyć programu <prgn>dselect</prgn> do zainstalowania pominiętych pakietów."
+"programie <command>dselect</command>. Kiedy dist-upgrade zakończy działanie, "
+"można użyć programu <command>dselect</command> do zainstalowania pominiętych "
+"pakietów."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8084,168 +8113,165 @@ msgstr ""
 "Jest ważne, aby dokładnie przyjrzeć się temu, co dist-upgrade zamierza "
 "zrobić, gdyż jego decyzje mogą czasami zdumiewać."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, 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 "
-#| "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 "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed 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 used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"Zachowanie programu <prgn>apt-get</prgn> można kontrolować za pomocą opcji "
-"linii poleceń szczegółowo opisanych w stronie podręcznika ekranowego <manref "
-"section=\"8\" name=\"apt-get\">. Najbardziej użyteczną z nich jest <tt>-d</"
-"tt>, która nie instaluje pobranych plików. Jeśli system musi pobrać dużą "
-"liczbę pakietów, instalowanie ich może być niepożądane, jeśli coś pójdzie "
-"nie tak. Jeśli użyto <tt>-d</tt>, to pobrane archiwa można zainstalować, "
-"ponownie uruchamiając polecenie, które spowodowało ich pobranie, tym razem "
-"bez opcji <tt>-d</tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> 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 <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"Zachowanie programu <command>apt-get</command> można kontrolować za pomocą "
+"opcji linii poleceń szczegółowo opisanych w stronie podręcznika ekranowego "
+"<citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>. Najbardziej użyteczną z nich jest <literal>-d</"
+"literal>, która nie instaluje pobranych plików. Jeśli system musi pobrać "
+"dużą liczbę pakietów, instalowanie ich może być niepożądane, jeśli coś "
+"pójdzie nie tak. Jeśli użyto <literal>-d</literal>, to pobrane archiwa można "
+"zainstalować, ponownie uruchamiając polecenie, które spowodowało ich "
+"pobranie, tym razem bez opcji <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"Metoda APT <prgn>dselect</prgn> dostarcza kompletnego systemu APT w "
-"interfejsie użytkownika programu wyboru pakietów <prgn>dselect</prgn>. "
-"<prgn>dselect</prgn> może być użyty do wybrania pakietów przeznaczonych do "
-"zainstalowania lub usunięcia, a APT zainstaluje lub usunie te pakiety."
+"Metoda APT <command>dselect</command> dostarcza kompletnego systemu APT w "
+"interfejsie użytkownika programu wyboru pakietów <command>dselect</command>. "
+"<command>dselect</command> może być użyty do wybrania pakietów "
+"przeznaczonych do zainstalowania lub usunięcia, a APT zainstaluje lub usunie "
+"te pakiety."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Aby włączyć metodę APT należy wybrać opcję \"[A] Dostęp\" w programie "
-"<prgn>dselect</prgn> , a następnie wybrać metodę APT. Użytkownik zostanie "
-"poproszony o skonfigurowanie listy <em>źródeł</em>, będących lokalizacjami, "
-"z których będą pobierane pakiety. Mogą być to strony internetowe, lokalne "
-"serwery lustrzane Debiana lub CD-ROM-y. Każde źródło może dostarczać tylko "
-"fragmentu pełnego archiwum Debiana, a APT automatycznie połączy je w "
-"kompletny zbiór pakietów. Jeśli używany jest CD-ROM, to dobrym pomysłem jest "
-"podanie najpierw jego, a potem podanie mirrorów umożliwiających dostęp do "
-"najnowszych wersji pakietów zawierających poprawki błędów. APT automatycznie "
-"użyje pakietów z CD-ROM-u zanim zacznie pobierać pakiety z Internetu."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command> , a następnie wybrać metodę APT. Użytkownik "
+"zostanie poproszony o skonfigurowanie listy <emphasis>źródeł</emphasis>, "
+"będących lokalizacjami, z których będą pobierane pakiety. Mogą być to strony "
+"internetowe, lokalne serwery lustrzane Debiana lub CD-ROM-y. Każde źródło "
+"może dostarczać tylko fragmentu pełnego archiwum Debiana, a APT "
+"automatycznie połączy je w kompletny zbiór pakietów. Jeśli używany jest CD-"
+"ROM, to dobrym pomysłem jest podanie najpierw jego, a potem podanie mirrorów "
+"umożliwiających dostęp do najnowszych wersji pakietów zawierających poprawki "
+"błędów. APT automatycznie użyje pakietów z CD-ROM-u zanim zacznie pobierać "
+"pakiety z Internetu."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "  Ustawianie listy źródłowych lokalizacji dystrybucji\n"
-"\t \n"
+"\n"
 " Proszę podać bazowy URL dystrybucji Debiana.\n"
 " Obsługiwane schematy połączeń to: http ftp file\n"
-"\t   \n"
+"\n"
 " Przykłady:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.pl.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
 "Ustawianie źródeł zaczyna się od pytania o bazową lokalizację Debiana. "
 "Domyślną wartością jest mirror HTTP. Następnie użytkownik jest pytany o "
 "dystrybucjÄ™ do pobrania."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Proszę podać znacznik dystrybucji do pobrania lub ścieżkę do pliku\n"
 " pakietów kończącą się znakiem \"/\". Zazwyczaj znacznikiem dystrybucji\n"
 " jest coÅ› w rodzaju: stable unstable testing non-US\n"
-"   \n"
-" Dystrybucja [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"Dystrybucja odnosi siÄ™ do wersji Debiana: <em>stable</em>(stabilna) to "
-"najnowsza wydana wersja, a <em>unstable</em> (niestabilna) to wersja "
-"rozwojowa. <em>non-US</em> jest dostępna tylko na wybranych serwerach "
-"lustrzanych i zawiera pakiety, które wykorzystują technologie szyfrowania "
-"danych lub inne rzeczy, które nie mogą być eksportowane z serwerów "
-"umieszczonych w Stanach Zjednoczonych. Importowanie tych pakietów do Stanów "
-"Zjednoczonych jest jednakże legalne."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Dystrybucja [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"Dystrybucja odnosi siÄ™ do wersji Debiana: <emphasis>stable</"
+"emphasis>(stabilna) to najnowsza wydana wersja, a <emphasis>unstable</"
+"emphasis> (niestabilna) to wersja rozwojowa. <emphasis>non-US</emphasis> "
+"jest dostępna tylko na wybranych serwerach lustrzanych i zawiera pakiety, "
+"które wykorzystują technologie szyfrowania danych lub inne rzeczy, które nie "
+"mogą być eksportowane z serwerów umieszczonych w Stanach Zjednoczonych. "
+"Importowanie tych pakietów do Stanów Zjednoczonych jest jednakże legalne."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Proszę podać komponenty do pobrania\n"
 " Zazwyczaj komponentem jest coÅ› w rodzaju: main contrib non-free\n"
-"  \n"
-" Komponenty [main contrib non-free]:"
+"\n"
+" Komponenty [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8258,8 +8284,8 @@ msgstr ""
 "\"),contrib i non-free zawierają pakiety, które zawierają restrykcje "
 "związane z ich używaniem lub rozpowszechnianiem."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -8268,24 +8294,24 @@ msgstr ""
 "odpytywanie użytkownika dopóty, dopóki nie poda wszystkich źródeł, które "
 "chciał skonfigurować."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Przed rozpoczęciem używania programu <prgn>dselect</prgn> należy w menu tego "
-"programu wybrać \"[U] Aktualizacja\", abyzaktualizować listę dostępnych "
-"pakietów. To polecenie jest nadzbiorem polecenia <tt>apt-get update</tt>, "
-"zapewniającym programowi <prgn>dselect</prgn> dostęp do pobranych informacji "
-"o pakietach. \"[U] Aktualizacja\" musi być wykonana, nawet jeśli wcześniej "
-"uruchomiono <tt>apt-get update</tt>."
+"Przed rozpoczęciem używania programu <command>dselect</command> należy w "
+"menu tego programu wybrać \"[U] Aktualizacja\", abyzaktualizować listę "
+"dostępnych pakietów. To polecenie jest nadzbiorem polecenia <literal>apt-get "
+"update</literal>, zapewniającym programowi <command>dselect</command> dostęp "
+"do pobranych informacji o pakietach. \"[U] Aktualizacja\" musi być wykonana, "
+"nawet jeśli wcześniej uruchomiono <literal>apt-get update</literal>."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -8298,76 +8324,83 @@ msgstr ""
 "bezużytecznymi, gdyż \"[I] Instalacja\" przeprowadza również te dwie "
 "operacje."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Domyślnie APT automatycznie usunie pliki pakietów (.deb), gdy tylko zostaną "
-"zainstalowane. Aby zmienić to zachowanie, proszę umieścić  <tt>Dselect::"
-"clean \"prompt\";</tt> w /etc/apt/apt.conf."
+"zainstalowane. Aby zmienić to zachowanie, proszę umieścić  <literal>Dselect::"
+"clean \"prompt\";</literal> w /etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "Interfejs"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"Metoda programu <command>dselect</command> jest tak naprawdÄ™ zbiorem "
+"skryptów wywołujących <command>apt-get</command>. Metoda ta ma jednakże "
+"większą funkcjonalność niż sam program <command>apt-get</command>."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Metoda APT programu <prgn>dselect</prgn> i program <prgn>apt-get</prgn> "
-"dzielą wspólny interfejs. Jest to prosty system, który najpierw informuje "
-"użytkownika, co będzie zrobione, a następnie to robi<footnote><p>Metoda "
-"programu <prgn>dselect</prgn> jest tak naprawdę zbiorem skryptów "
-"wywołujących <prgn>apt-get</prgn>. Metoda ta ma jednakże większą "
-"funkcjonalność niż sam program <prgn>apt-get</prgn>.</p></footnote>. Po "
-"wyświetleniu podsumowania informującego o tym, co będzie zrobione, APT "
-"wyświetla komunikaty dotyczące postępu przeprowadzanych operacji, tak żeby "
-"można było oszacować czas pozostały do ich zakończenia."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Metoda APT programu <command>dselect</command> i program <command>apt-get</"
+"command> dzielą wspólny interfejs. Jest to prosty system, który najpierw "
+"informuje użytkownika, co będzie zrobione, a następnie to robi. <placeholder "
+"type=\"footnote\" id=\"0\"/> Po wyświetleniu podsumowania informującego o "
+"tym, co będzie zrobione, APT wyświetla komunikaty dotyczące postępu "
+"przeprowadzanych operacji, tak żeby można było oszacować czas pozostały do "
+"ich zakończenia."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Uruchamianie"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Przed każdą operacją, z wyjątkiem update, APT przeprowadza pewne akcje "
 "przygotowujące wewnętrzny stan. Sprawdza również stan systemu. Te same "
-"operacje można przeprowadzić w dowolnej chwili, uruchamiając <tt>apt-get "
-"check</tt>."
+"operacje można przeprowadzić w dowolnej chwili, uruchamiając <literal>apt-"
+"get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Czytanie list pakietów... Gotowe\n"
-"Budowanie drzewa zależności... Gotowe"
+"Budowanie drzewa zależności... Gotowe\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -8379,21 +8412,21 @@ msgstr ""
 "następnym uruchomieniu. Jeśli nie znajdzie niektórych plików pakietów, to "
 "wypisze ostrzeżenie, a te pakiety zignoruje."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "Końcową operacją jest szczegółowa analiza zależności w systemie. Sprawdzana "
 "jest każda zależność każdego pakietu zainstalowanego lub rozpakowanego. W "
-"razie wykrycia problemów z zależnościami <prgn>apt-get</prgn> wypisze "
+"razie wykrycia problemów z zależnościami <command>apt-get</command> wypisze "
 "odpowiedni komunikat i odmówi dalszego działania."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -8403,14 +8436,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Czytanie list pakietów... Gotowe\n"
@@ -8419,17 +8452,17 @@ msgstr ""
 "Następujące pakiety mają niespełnione zależności:\n"
 "  9fonts: Wymaga: xlib6g ale nie jest zainstalowany\n"
 "  uucp: Wymaga: mailx ale nie jest zainstalowany\n"
-"  blast: Wymaga: xlib6g (>= 3.3-5) ale nie jest zainstalowany\n"
+"  blast: Wymaga: xlib6g (&gt;= 3.3-5) ale nie jest zainstalowany\n"
 "  adduser: Wymaga: perl-base ale nie jest zainstalowany\n"
 "  aumix: Wymaga: libgpmg1 but ale nie jest zainstalowany\n"
 "  debiandoc-sgml: Wymaga: sgml-base ale nie jest zainstalowany\n"
-"  bash-builtins: Wymaga: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Wymaga: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Wymaga: svgalibg1 but it is not installed\n"
-"           Wymaga: xlib6g (>= 3.3-5) ale nie jest zainstalowany\n"
-"  libreadlineg2: Jest w konflikcie z: libreadline2 (<< 2.1-2.1)"
+"           Wymaga: xlib6g (&gt;= 3.3-5) ale nie jest zainstalowany\n"
+"  libreadlineg2: Jest w konflikcie z: libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -8442,87 +8475,98 @@ msgstr ""
 "jest wypisywany w osobnej linii razem z niespełnionymi zależnościami. Podane "
 "jest również krótkie wyjaśnienie dotyczące przyczyny problemu."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"APT rozważa wszystkie znane zależności i próbuje nie dopuścić do zepsucia "
+"pakietów."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Są dwie przyczyny, z których powodu system może być zepsuty w powyższy "
-"sposób. Pierwszą jest to, że <prgn>dpkg</prgn> podczas aktualizacji systemu "
-"nie zauważył jakiejś subtelnej relacji między pakietami<footnote><p>APT "
-"rozważa wszystkie znane zależności i próbuje nie dopuścić do zepsucia "
-"pakietów.</p></footnote>. Drugą przyczyną jest wystąpienie błędu w czasie "
-"instalowania pakietu. W takim przypadku pakiet może być rozpakowany, mimo że "
-"pakiety od niego zależące nie są zainstalowane."
+"sposób. Pierwszą jest to, że <command>dpkg</command> podczas aktualizacji "
+"systemu nie zauważył jakiejś subtelnej relacji między pakietami<placeholder "
+"type=\"footnote\" id=\"0\"/>. Drugą przyczyną jest wystąpienie błędu w "
+"czasie instalowania pakietu. W takim przypadku pakiet może być rozpakowany, "
+"mimo że pakiety od niego zależące nie są zainstalowane."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "Druga przyczyna jest o wiele mniej poważna niż pierwsza, ponieważ APT "
 "wymusza pewne więzy integralności dotyczące kolejności instalowania "
-"pakietów. W obu przypadkach przekazanie programowi <prgn>apt-get</prgn> "
-"opcji <tt>-f</tt> wymusi na APT znalezienie rozwiązania umożliwiającego mu "
-"kontynuowanie działania. Metoda APT programu <prgn>dselect</prgn> zawsze "
-"przekazuje opcję <tt>-f</tt>, aby móc kontynuować po wystąpieniu błędu w "
-"skryptach opiekunów pakietów."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Jednak gdy opcja <tt>-f</tt> jest używana do poprawienia zależności w "
-"poważnie uszkodzonym systemie (pierwsza z opisanych wyżej przyczyn), możliwe "
-"jest że albo od razu zwróci błąd, albo nie powiedzie się sekwencja "
-"instalowania pakietów. W obu przypadkach należy poprawić zależności ręcznie, "
-"używając do tego dpkg (być może przekazując mu opcje wymuszające \"--"
-"force-...\"), w takim stopniu, aby umożliwić działanie systemowi APT."
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"pakietów. W obu przypadkach przekazanie programowi <command>apt-get</"
+"command> opcji <literal>-f</literal> wymusi na APT znalezienie rozwiÄ…zania "
+"umożliwiającego mu kontynuowanie działania. Metoda APT programu "
+"<command>dselect</command> zawsze przekazuje opcjÄ™ <literal>-f</literal>, "
+"aby móc kontynuować po wystąpieniu błędu w skryptach opiekunów pakietów."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Jednak gdy opcja <literal>-f</literal> jest używana do poprawienia "
+"zależności w poważnie uszkodzonym systemie (pierwsza z opisanych wyżej "
+"przyczyn), możliwe jest że albo od razu zwróci błąd, albo nie powiedzie się "
+"sekwencja instalowania pakietów. W obu przypadkach należy poprawić "
+"zależności ręcznie, używając do tego dpkg (być może przekazując mu opcje "
+"wymuszające \"--force-...\"), w takim stopniu, aby umożliwić działanie "
+"systemowi APT."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "Raport stanu"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
-"Przed rozpoczęciem przetwarzania <prgn>apt-get</prgn> wyświetli raport "
+"Przed rozpoczęciem przetwarzania <command>apt-get</command> wyświetli raport "
 "zawierający informacje o tym, co będzie zrobione. W ogólności raport ten "
 "zależy od typu wykonywanej operacji, jednakże występuje w nim kilka "
 "elementów wspólnych dla wszystkich typów. We wszystkich wypadkach "
-"wyświetlane są informacje o końcowym stanie, brana jest pod uwagę opcja <tt>-"
-"f</tt>, a także wszystkie istotne działania wykonywanego polecenia."
+"wyświetlane są informacje o końcowym stanie, brana jest pod uwagę opcja "
+"<literal>-f</literal>, a także wszystkie istotne działania wykonywanego "
+"polecenia."
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "Lista dodatkowych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -8530,86 +8574,86 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Zostaną zainstalowane następujące dodatkowe pakiety:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "Lista dodatkowych pakietów wyświetla wszystkie pakiety, które będą "
 "zainstalowane lub zaktualizowane oprócz tych wymienionych w linii poleceń. "
-"Jest generowana tylko dla polecenia <tt>install</tt>. Wymienione pakiety sÄ… "
-"najczęściej wynikiem automatycznej instalacji."
+"Jest generowana tylko dla polecenia <literal>install</literal>. Wymienione "
+"pakiety są najczęściej wynikiem automatycznej instalacji."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "Pakiety przeznaczone do usunięcia"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Następujące pakiety zostaną USUNIĘTE:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "Lista pakietów przeznaczonych do usunięcia wyświetla wszystkie pakiety, "
 "które zostaną usunięte z systemu. Może być pokazana dla każdej operacji i "
 "powinna być szczegółowo przeanalizowana, aby zapewnić, że żaden istotny "
-"pakiet nie będzie usunięty. W szczególności opcja <tt>-f</tt> może "
+"pakiet nie będzie usunięty. W szczególności opcja <literal>-f</literal> może "
 "wygenerować sporo pakietów do usunięcia, także w przypadku jej użycia należy "
 "szczególnie dokładnie przeanalizować wyświetlany raport. Lista może zawierać "
 "pakiety usuwane z powodu ich tylko częściowego zainstalowania, wynikającego "
 "być może z przerwania wcześniejszej instalacji."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "Lista nowych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Zostaną zainstalowane następujące NOWE pakiety:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -8619,58 +8663,58 @@ msgstr ""
 "pakiety nie są obecnie zainstalowane w systemie, ale będą, kiedy APT skończy "
 "działanie."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "Lista zatrzymanych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Następujące pakiety zostały zatrzymane:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Jeśli aktualizowany jest cały system, to jest możliwe, że nowe wersje "
 "pakietów nie będą mogły być zainstalowane, ponieważ wymagają nowych pakietów "
 "lub są w konflikcie z już zainstalowanymi pakietami. W takim wypadku pakiet "
 "pojawi się na liście pakietów zatrzymanych. Najlepszym sposobem na "
-"zainstalowanie takich pakietów jest użycie <tt>apt-get install</tt> lub "
-"rozwiązanie problemów z zależnościami za pomocą programu <prgn>dselect</"
-"prgn>."
+"zainstalowanie takich pakietów jest użycie <literal>apt-get install</"
+"literal> lub rozwiązanie problemów z zależnościami za pomocą programu "
+"<command>dselect</command>."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "Ostrzeżenie o zmianie zatrzymanych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Zostaną zmienione następujące zatrzymane pakiety:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -8680,32 +8724,32 @@ msgstr ""
 "W takim przypadku wypisywane jest ostrzeżenie o zmianie zatrzymanego "
 "pakietu. Może się to zdarzyć tylko podczas dist-upgrade lub install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Podsumowanie"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "APT zakończy raport podsumowaniem wszystkich zmian, które przeprowadzi."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 aktualizowanych, 8 nowo instalowanych, 25 usuwanych i 51 nieaktualizowanych.\n"
 "12 nie w pełni zainstalowanych lub usuniętych.\n"
-"Konieczne pobranie 65.7M/66.7M archiwów. Po rozpakowaniu zostanie użyte 26.5M."
+"Konieczne pobranie 65.7M/66.7M archiwów. Po rozpakowaniu zostanie użyte 26.5M.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -8734,8 +8778,8 @@ msgstr ""
 "będzie zajęta w /usr po zakończeniu instalacji. Wartość ta może wskazywać na "
 "zwolnienie miejsca na dysku, jeśli usuwana jest duża liczba pakietów."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -8743,13 +8787,13 @@ msgstr ""
 "Używając opcji -u, można wygenerować raport pokazujący pakiety przeznaczone "
 "do aktualizacji, podobny do tego pokazanego w poprzednim przykładzie."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "Wyświetlanie stanu przetwarzania"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -8757,8 +8801,8 @@ msgstr ""
 "Podczas pobierania archiwów i plików pakietów APT wyświetla serię "
 "komunikatów o stanie."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -8767,7 +8811,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Pob:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -8775,127 +8819,126 @@ msgstr ""
 "Traf http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Pob:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Pob:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Oczekiwane na nagłówki' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Oczekiwane na nagłówki' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Linie zaczynajÄ…ce siÄ™ od <em>Pob:</em> sÄ… wypisywane, kiedy APT zaczyna "
-"pobierać plik, a ostatnia linia oznacza postęp pobierania. Pierwsza wartość "
-"podana w procentach określa całkowity procent pobierania wszystkich plików. "
-"Niestety rozmiar plików Package nie jest znany, tak więc <tt>apt-get update</"
-"tt> estymuje procent wykonanego pobierania, co powoduje pewne nieścisłości."
+"Linie zaczynajÄ…ce siÄ™ od <emphasis>Pob:</emphasis> sÄ… wypisywane, kiedy APT "
+"zaczyna pobierać plik, a ostatnia linia oznacza postęp pobierania. Pierwsza "
+"wartość podana w procentach określa całkowity procent pobierania wszystkich "
+"plików. Niestety rozmiar plików Package nie jest znany, tak więc "
+"<literal>apt-get update</literal> estymuje procent wykonanego pobierania, co "
+"powoduje pewne nieścisłości."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "Następna sekcja linii statusu powtarza się dla każdego wątku pobierania, "
 "oznacza przeprowadzanie operacji i podaje kilka użytecznych informacji na "
-"temat tego, co siÄ™ dzieje. Czasem sekcja ta zawiera komunikat <em>Tworzenie "
-"procesu potomnego</em>, co oznacza, że system operacyjny ładuje moduł "
-"pobierania. Pierwszym słowem po znaku \"[\" jest liczba pobrań, dokładnie "
-"taka jaka jest pokazana liczba linii historii pobrań. Następnie w skróconej "
-"formie wyświetlana jest nazwa pobieranego obiektu. W przypadku archiwów "
-"nazwa ta będzie zawierać nazwę pobieranego pakietu."
+"temat tego, co siÄ™ dzieje. Czasem sekcja ta zawiera komunikat "
+"<emphasis>Tworzenie procesu potomnego</emphasis>, co oznacza, że system "
+"operacyjny ładuje moduł pobierania. Pierwszym słowem po znaku \"[\" jest "
+"liczba pobrań, dokładnie taka jaka jest pokazana liczba linii historii "
+"pobrań. Następnie w skróconej formie wyświetlana jest nazwa pobieranego "
+"obiektu. W przypadku archiwów nazwa ta będzie zawierać nazwę pobieranego "
+"pakietu."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "W pojedynczych cudzysłowach podawany jest komunikat wskazujący na postęp "
 "tworzenia połączenia pobierania danych. Zazwyczaj postęp ten jest sekwencją "
-"zdarzeń od <em>Podłączanie</em> przez <em>Oczekiwanie na nagłówki</em> do "
-"<em>Pobieranie</em> lub <em>Wznawianie</em>. Końcową wartością jest liczba "
-"bajtów pobranych ze zdalnego serwera. Kiedy tylko pobieranie się rozpocznie, "
-"wartość ta jest wyświetlana jw formacie typu <tt>102/10.2k</tt>, co oznacza, "
-"że pobrano 102 bajty, a oczekuje się jeszcze pobrania 10.2 kilobajtów. Aby "
-"zaoszczędzić miejsce, całkowity rozmiar jest zawsze wyświetlany jako w "
-"postaci 4-znakowej. Po rozmiarze następuje procentowy wskaźnik postępu "
-"pobierania danego pliku. Przedostatnim elementem jest bieżąca średnia "
-"prędkość pobierania, która jest aktualizowane co każde 5 sekund i "
-"odzwierciedla tempo pobierania w tym okresie. W końcu wyświetlany jest "
-"estymowany czas pobierania, regularnie aktualizowany i odzwierciedlajÄ…cy "
-"czas pozostały do zakończenia pobierania przy założeniu utrzymania się "
-"pokazanego tempa pobierania."
-
-#. type: <p></p>
-#: guide.sgml:530
+"zdarzeń od <emphasis>Podłączanie</emphasis> przez <emphasis>Oczekiwanie na "
+"nagłówki</emphasis> do <emphasis>Pobieranie</emphasis> lub "
+"<emphasis>Wznawianie</emphasis>. Końcową wartością jest liczba bajtów "
+"pobranych ze zdalnego serwera. Kiedy tylko pobieranie siÄ™ rozpocznie, "
+"wartość ta jest wyświetlana jw formacie typu <literal>102/10.2k</literal>, "
+"co oznacza, że pobrano 102 bajty, a oczekuje się jeszcze pobrania 10.2 "
+"kilobajtów. Aby zaoszczędzić miejsce, całkowity rozmiar jest zawsze "
+"wyświetlany jako w postaci 4-znakowej. Po rozmiarze następuje procentowy "
+"wskaźnik postępu pobierania danego pliku. Przedostatnim elementem jest "
+"bieżąca średnia prędkość pobierania, która jest aktualizowane co każde 5 "
+"sekund i odzwierciedla tempo pobierania w tym okresie. W końcu wyświetlany "
+"jest estymowany czas pobierania, regularnie aktualizowany i "
+"odzwierciedlający czas pozostały do zakończenia pobierania przy założeniu "
+"utrzymania siÄ™ pokazanego tempa pobierania."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "Linia stanu jest aktualizowana co każde pół sekundy, aby na bieżąco "
 "informować użytkownika o postępie pobierania, podczas gdy linie \"Pob:\" są "
 "przesuwane w dół, gdy tylko zacznie się pobieranie nowego pliku. Ponieważ "
 "linia stanu jest ciągle zmieniana, wyjście programu nie jest odpowiednie do "
-"przekierowania do pliku. Aby usunąć linie stanu, należy użyć opcji <tt>-q</"
-"tt>."
+"przekierowania do pliku. Aby usunąć linie stanu, należy użyć opcji <literal>-"
+"q</literal>."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT używa programu <prgn>dpkg</prgn> do instalowania archiwów i przełączy "
-"się do interfejsu <prgn>dpkg</prgn>, gdy tylko zakończy pobieranie plików. "
-"<prgn>dpkg</prgn> może również zadawać pytania podczas przetwarzania "
-"pakietów, a same pakiety także mogą zadawać pytania. Każde pytanie zazwyczaj "
-"jest poprzedzone opisem, a same pytania są zbyt zróżnicowane, by je tutaj "
-"opisać."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT używa programu <command>dpkg</command> do instalowania archiwów i "
+"przełączy się do interfejsu <command>dpkg</command>, gdy tylko zakończy "
+"pobieranie plików. <command>dpkg</command> może również zadawać pytania "
+"podczas przetwarzania pakietów, a same pakiety także mogą zadawać pytania. "
+"Każde pytanie zazwyczaj jest poprzedzone opisem, a same pytania są zbyt "
+"zróżnicowane, by je tutaj opisać."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "Używanie APT w trybie offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -8904,23 +8947,24 @@ msgstr ""
 "dostępu, do sieci, a w szczególności metodę pozwalającą na przeprowadzanie "
 "aktualizacji systemu."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Wstęp"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Wprowadzenie"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -8932,8 +8976,8 @@ msgstr ""
 "że nasz komputer, który pracuje na powolnym łączu takim jak modem, jest "
 "znacznie oddalony od innego komputera z szybkim Å‚Ä…czem."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -8941,9 +8985,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "Rozwiązaniem tego problemu jest użycie pojemnych przenośnych nośników takich "
 "jak dyskietka Zip lub dysk SuperDisk. Nośniki te nie są wystarczająco "
@@ -8956,8 +9000,8 @@ msgstr ""
 "innym systemem operacyjnym i programem narzędziowym do pobierania plików "
 "takim jak wget."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -8970,13 +9014,13 @@ msgstr ""
 "sformatowany do obsługi systemu plików pozwalającego posługiwać się długimi "
 "nazwami plików (np. ext2, fat32 albo vfat)."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "Używanie programu APT na obu komputerach"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -8989,8 +9033,8 @@ msgstr ""
 "które pakiety trzeba pobrać. Struktura katalogów na dysku powinna wyglądać "
 "następująco:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9000,7 +9044,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9009,40 +9053,42 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "Plik konfiguracyjny"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Plik konfiguracyjny powinien informować program APT, aby przechowywał swoje "
 "pliki na dysku, a także używał plików konfiguracyjnych z dysku. Plik sources."
 "list powinien zawierać prawidłowe odnośniki, których należy użyć na zdalnym "
-"komputerze, a plik status powinien być kopią <em>/var/lib/dpkg/status</em>. "
-"Należy zauważyć, że podczas używania lokalnego archiwum trzeba użyć tych "
-"samych odnośników o identycznej składni."
+"komputerze, a plik status powinien być kopią <emphasis>/var/lib/dpkg/status</"
+"emphasis>. Należy zauważyć, że podczas używania lokalnego archiwum trzeba "
+"użyć tych samych odnośników o identycznej składni."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> musi zawierać niezbędne wpisy, by APT korzystał z dysku:"
+"<emphasis>apt.conf</emphasis> musi zawierać niezbędne wpisy, by APT "
+"korzystał z dysku:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9050,10 +9096,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9064,20 +9110,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Wpis nie jest wymagany, jeśli oba komputery mają tę samą architekturę;\n"
 "    podaje architekturę naszego komputera programowi APT na odległym komputerze */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Używaj katalogu disc na informacje stanu i przekieruj plik status\n"
@@ -9088,68 +9134,71 @@ msgstr ""
 "   // Katalog lokalnie przechowywanych pakietów binarnych\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Lokalizacja pliku sources.list.\n"
 "   Etc \"/disc\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Więcej szczegółów można zobaczyć w stronie podręcznika apt.conf i w "
-"przykładowym pliku konfiguracyjnym <em>/usr/share/doc/apt/examples/apt.conf</"
-"em>."
+"przykładowym pliku konfiguracyjnym <emphasis>/usr/share/doc/apt/examples/apt."
+"conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Pierwszą rzeczą, jaką należy zrobić na oddalonym komputerze z Debianem to "
-"zamontować dysk i przekopiować na niego plik <em>/var/lib/dpkg/status</em>. "
-"Trzeba także utworzyć strukturę katalogów przedstawioną we \"Wprowadzeniu\": "
-"<em>archives/partial/</em> i <em>lists/partial/</em>. Następnie należy "
-"przenieść dysk do oddalonego komputera z szybkim łączem i skonfigurować plik "
-"sources.list. Na oddalonym komputerze wykonujemy kolejno:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"zamontować dysk i przekopiować na niego plik <emphasis>/var/lib/dpkg/status</"
+"emphasis>. Trzeba także utworzyć strukturę katalogów przedstawioną we "
+"\"Wprowadzeniu\": <emphasis>archives/partial/</emphasis> i <emphasis>lists/"
+"partial/</emphasis>. Następnie należy przenieść dysk do oddalonego komputera "
+"z szybkim łączem i skonfigurować plik sources.list. Na oddalonym komputerze "
+"wykonujemy kolejno:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT aktualizuje ustawienia ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ]"
+" [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Polecenie dist-upgrade można zastąpić każdym innym podstawowym poleceniem "
 "APT, w szczególności dselect-upgrade. Można nawet użyć APT jako metody "
-"dostępu dla <em>dselect</em>. Jednak stworzy to problem w przeniesieniu "
-"Twoich operacji wyborów z powrotem na lokalny komputer."
+"dostępu dla <emphasis>dselect</emphasis>. Jednak stworzy to problem w "
+"przeniesieniu Twoich operacji wyborów z powrotem na lokalny komputer."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9158,24 +9207,24 @@ msgstr ""
 "niezbędne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do "
 "siebie i wpisujemy:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT tworzy lokalną kopię plików cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Może też być inne polecenie programu APT ]"
+"  [ Może też być inne polecenie programu APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9183,8 +9232,8 @@ msgstr ""
 "Do prawidłowego działania koniecznie należy podać plik status z lokalnej "
 "maszyny. To jest bardzo ważne!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9199,25 +9248,25 @@ msgstr ""
 "to możliwe. NIE podmieniaj pliku status, jeśli dpkg lub APT były uruchamiane "
 "w międzyczasie!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "Używanie programów APT i wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> jest popularnym i przenośnym programem narzędziowym pobierania "
-"plików, który działa prawie na każdym komputerze. W przeciwieństwie do "
-"metody opisanej powyżej ta wymaga, aby na lokalnym komputerze była aktualna "
-"lista dostępnych pakietów."
+"<emphasis>wget</emphasis> jest popularnym i przenośnym programem "
+"narzędziowym pobierania plików, który działa prawie na każdym komputerze. W "
+"przeciwieństwie do metody opisanej powyżej ta wymaga, aby na lokalnym "
+"komputerze była aktualna lista dostępnych pakietów."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9229,13 +9278,13 @@ msgstr ""
 "następnie przygotujemy skrypt dla programu wget, który pobierze właściwe "
 "pakiety."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Kolejne kroki"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9244,22 +9293,22 @@ msgstr ""
 "plików konfiguracyjnych. Używamy jedynie podstawowych poleceń APT, by "
 "wygenerować listę plików."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Wybierz \"no\" po znaku zachęty, upewnij się, czy to właściwy wybór ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -9267,8 +9316,8 @@ msgstr ""
 "Można tu użyć także polecenia innego niż dist-upgrade, na przykład dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -9280,25 +9329,25 @@ msgstr ""
 "uruchomić w bieżącym katalogu o punkcie montowania disc, tak aby zapisywał "
 "dane na tym dysku."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "Na oddalonym komputerze należy wykonać coś takiego"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ czekaj.. ]"
+"  [ czekaj.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -9306,14 +9355,14 @@ msgstr ""
 "Gdy archiwa zostaną pobrane i dysk wróci do komputera z Debianem, "
 "instalowanie można prowadzić dalej poleceniem:"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
@@ -9329,14 +9378,12 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ 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>"
 
@@ -9364,7 +9411,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ 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), "
@@ -9379,7 +9425,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ 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 "
@@ -9388,11 +9433,9 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ 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 "
@@ -9405,7 +9448,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ 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>."
@@ -9445,7 +9487,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "Universal Resource Locator - URL). Pozostała część linii może być "
 #~ "komentarzem, jeśli zaczyna się od znaku \"#\"."
 
-#
 #~ msgid ""
 #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
 #~ "get check</command>. It builds the source and package caches from the "
@@ -9457,7 +9498,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "podstawie źródeł wymienionych w &sources-list; oraz pliku <filename>/var/"
 #~ "lib/dpkg/status</filename>."
 
-#
 #~ msgid ""
 #~ "Unless the <option>-h</option>, or <option>--help</option> option is "
 #~ "given one of the commands below must be present.  <placeholder type="
@@ -9467,14 +9507,12 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "<option>-h</option> lub <option>--help</option>. <placeholder type="
 #~ "\"variablelist\" id=\"0\"/>"
 
-#
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora"
 
 #~ msgid "add <replaceable>file(s)</replaceable>"
 #~ msgstr "add <replaceable>plik(i)</replaceable>"
 
-#
 #~ msgid ""
 #~ "<literal>add</literal> adds the named package index files to the package "
 #~ "cache.  This is for debugging only."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 0c3052c72..c92a2016d 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -2,20 +2,20 @@
 # Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the apt package.
 #
-# Américo Monteiro <a_monteiro@netcabo.pt>, 2009, 2010, 2012.
+# Américo Monteiro <a_monteiro@gmx.com>, 2009 - 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.7.1\n"
+"Project-Id-Version: apt 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+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"
+"POT-Creation-Date: 2014-08-29 11:04+0200\n"
+"PO-Revision-Date: 2014-08-29 00:34+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
@@ -660,82 +660,90 @@ msgstr ""
 "export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: 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
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: 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
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
-msgstr ""
+msgstr "interface de linha de comandos"
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 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 ""
+"<command>apt</command> (Advanced Package Tool) é uma ferramenta de linha de "
+"comandos para manuseamento de pacotes. Disponibiliza uma interface de linha "
+"de comandos para a gestão de pacotes do sistema. Veja também &apt-get; e "
+"&apt-cache; para mais opções de baixo nível dos comandos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 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 ""
+"<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
+"padrões da shell para corresponder aos nomes de pacotes e são suportadas as "
+"seguintes opções <option>--installed</option>, <option>--upgradable</"
+"option>, <option>--all-versions</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
+"<literal>search</literal> procura por termo(s) determinado(s) e mostra os "
+"pacotes correspondentes."
 
 #. 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."
+#: apt.8.xml:60
 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."
+"<literal>show</literal> mostra a informação do pacote para o(s) pacote(s) "
+"determinado(s)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
+"<literal>install</literal> é seguido por um ou mais nomes de pacotes que se "
+"deseja instalar ou actualizar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -752,7 +760,7 @@ msgstr ""
 "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
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -767,56 +775,61 @@ msgstr ""
 "pacote identificado será instalado em vez de removido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
+"<literal>edit-sources</literal> permite-lhe editar o seu ficheiro sources."
+"list e disponibiliza verificações de sanidade básicas."
 
 #. 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."
+#: apt.8.xml:95
 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."
+"<literal>update</literal> é usado para re-sincronizar o índice dos pacotes a "
+"partir das suas fontes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
 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."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
+"<literal>upgrade</literal> é usado para instalar as versões mais recentes de "
+"todos os pacotes actualmente instalados no sistema a partir das fontes "
+"enumeradas em <filename>/etc/apt/sources.list</filename>. Serão instalados "
+"novos pacotes, mas pacotes existentes nunca serão removidos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 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 ""
+"<literal>full-upgrade</literal> executa a função de upgrade mas pode também "
+"remover pacotes instalados se tal for necessário de modo a resolver um "
+"conflito de pacotes."
 
 #. 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
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "opções"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
-msgstr ""
+msgstr "Utilização de script"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 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 "
@@ -824,109 +837,99 @@ msgid ""
 "&apt-cache; and &apt-get; via APT options. Please prefer using these "
 "commands in your scripts."
 msgstr ""
+"A linha de comandos do &apt; foi desenhada como ferramenta de utilizador "
+"final e pode variar os textos mostrados entre versões. Apesar de tentar não "
+"perder a compatibilidade com versões anteriores, não há garantia disso. "
+"Todas as funcionalidades do &apt; estão disponíveis em &apt-cache; e &apt-"
+"get; via opções do APT. Por favor dê preferência a usar estes comandos nos "
+"seus scripts."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "Diferenças para o &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 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 ""
+"O comando  <command>apt</command> destina-se a ser agradável para os "
+"utilizadores finais e não precisa de ser compatível com as versões "
+"anteriores como o &apt-get;. Por isso algumas opções são diferentes."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
+#: apt.8.xml:147
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "a linha <literal>Package:</literal>"
+msgstr "A opção <literal>DPkg::Progress-Fancy</literal> está activada."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
+#: apt.8.xml:151
 msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "a linha <literal>Component:</literal>"
+msgstr "A opção <literal>APT::Color</literal> está activada."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
+"Está disponível um novo comando <literal>list</literal> de modo semelhante a "
+"<literal>dpkg --list</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+#: apt.8.xml:160
 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>"
+msgstr ""
+"A opção <literal>upgrade</literal> tem <literal>--with-new-pkgs</literal> "
+"activado por predefinição."
 
 #. 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
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 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."
+#: apt.8.xml:171
 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."
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, 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
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 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."
+#: apt.8.xml:177
 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."
+"<command>apt</command> devolve zero na operação normal, 100 decimal em erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 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 ""
-#| "<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;."
+#: apt-get.8.xml:35
 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 "
@@ -936,11 +939,11 @@ msgstr ""
 "<command>apt-get</command> é a ferramenta de linha de comandos para lidar "
 "com pacotes, e pode ser considerada o \"back-end\" dos utilizadores para "
 "outras ferramentas que usam a biblioteca APT. Existem várias interfaces "
-"\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;."
+"\"front-end\" como o &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
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -949,7 +952,7 @@ msgstr ""
 "fornecida, um dos comandos abaixo têm que estar presentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -973,7 +976,7 @@ msgstr ""
 "ficheiros de pacotes não pode ser conhecido com antecedência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -999,7 +1002,7 @@ msgstr ""
 "novas versões de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1024,7 +1027,7 @@ msgstr ""
 "sobrepor as definições gerais em pacotes individuais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1040,7 +1043,7 @@ msgstr ""
 "estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -1070,7 +1073,7 @@ msgstr ""
 "de resolução de conflitos do apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1079,7 +1082,7 @@ msgstr ""
 "e devem ser usados com cuidado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -1099,7 +1102,7 @@ msgstr ""
 "descarregadas e instaladas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1108,7 +1111,7 @@ msgstr ""
 "instalação alternativa para pacotes individuais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -1127,7 +1130,7 @@ 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:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1138,7 +1141,7 @@ msgstr ""
 "configuração são também apagados)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1157,7 +1160,7 @@ msgstr ""
 "<literal>pkg/release</literal>, se possível."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1172,7 +1175,7 @@ msgstr ""
 "de fonte erradas (muito antigas/muito novas) ou mesmo nenhuma."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1187,7 +1190,7 @@ msgstr ""
 "então o pacote fonte não será desempacotado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -1202,7 +1205,7 @@ msgstr ""
 "Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1213,7 +1216,7 @@ msgstr ""
 "descarregados para o directório actual, como tarballs fonte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1228,7 +1231,7 @@ msgstr ""
 "arquitectura-anfitriã com a opção <option>--host-architecture</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1237,7 +1240,7 @@ msgstr ""
 "de pacotes e verifica por dependências quebradas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1246,16 +1249,7 @@ msgstr ""
 "directório actual."
 
 #. 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."
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1264,14 +1258,10 @@ msgid ""
 msgstr ""
 "<literal>clean</literal> limpa o repositório local dos ficheiros de pacotes "
 "obtidos. Remove tudo excepto o ficheiro lock de <filename>&cachedir;/"
-"archives/</filename> e <filename>&cachedir;/archives/partial/</filename>. "
-"Quando o APT é usado com um método &dselect;, <literal>clean</literal> é "
-"executado automaticamente. Aqueles que não usam o dselect irão provavelmente "
-"querer executar <literal>apt-get clean</literal> de tempos a tempos para "
-"libertar espaço do disco."
+"archives/</filename> e <filename>&cachedir;/archives/partial/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1290,7 +1280,7 @@ msgstr ""
 "pacotes instalados sejam apagados se estiver definida para 'off'."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1301,7 +1291,7 @@ msgstr ""
 "que já não são necessários."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1324,7 +1314,7 @@ msgstr ""
 "para o comando <option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1333,7 +1323,7 @@ msgstr ""
 "de Configuração: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1342,7 +1332,7 @@ msgstr ""
 "Configuração: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1352,20 +1342,7 @@ msgstr ""
 "Download-Only</literal>."
 
 #. 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>."
+#: apt-get.8.xml:271
 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 "
@@ -1387,13 +1364,13 @@ msgstr ""
 "permite que existam num sistema dependências de pacotes quebradas. É "
 "possível que uma estrutura de dependências de um sistema esteja tão "
 "corrompida ao ponto de requerer intervenção manual (o que normalmente "
-"significa usar o &dselect; ou <command>dpkg --remove</command> para eliminar "
-"alguns dos pacotes ofensivos). O uso desta opção juntamente com <option>-m</"
-"option> pode produzir um erro em algumas situações. Item de Configuração: "
+"significa usar o <command>dpkg --remove</command> para eliminar alguns dos "
+"pacotes ofensivos). O uso desta opção juntamente com <option>-m</option> "
+"pode produzir um erro em algumas situações. Item de Configuração: "
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1412,7 +1389,7 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1423,7 +1400,7 @@ msgstr ""
 "descarregados. Item de Configuração: <literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1443,7 +1420,7 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1454,7 +1431,7 @@ msgstr ""
 "Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1473,7 +1450,7 @@ msgstr ""
 "avisos do <literal>apt-get</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1488,7 +1465,7 @@ msgstr ""
 "indicam quebras que não têm consequência (raro)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1504,7 +1481,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1513,7 +1490,7 @@ msgstr ""
 "<literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1523,7 +1500,7 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1532,15 +1509,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Show-Versions</literal>."
 
 #. 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>"
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1557,15 +1526,7 @@ msgstr ""
 "item de Configuração: <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>"
+#: apt-get.8.xml:374
 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 "
@@ -1573,15 +1534,15 @@ msgid ""
 "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>"
+"Esta opção controla perfis de compilação activados pelos quais um pacote "
+"fonte é compilado por <command>apt-get source --compile</command> e como as "
+"dependências de compilação são satisfeitas. Por predefinição, nenhum perfil "
+"de compilação está activo. Podem ser activados ao mesmo tempo mais do que um "
+"perfil de compilação ao concatená-los com uma vírgula. Item de configuração: "
+"<literal>APT::Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1590,7 +1551,7 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1603,7 +1564,7 @@ msgstr ""
 "Item de Configuração: <literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1613,9 +1574,16 @@ msgid ""
 "will never remove packages, only allow adding new ones.  Configuration Item: "
 "<literal>APT::Get::Upgrade-Allow-New</literal>."
 msgstr ""
+"Permite a instalação de novos pacotes quando usado em conjunto com "
+"<literal>upgrade</literal>. Isto é útil se a actualização de um pacote "
+"instalado requerer que sejam instaladas novas dependências. Em vez de reter "
+"o pacote, o <literal>upgrade</literal>irá actualizar o pacote e instalar as "
+"novas dependências. Note que <literal>upgrade</literal> com esta opção nunca "
+"irá remover pacotes, apenas permitir adicionar novos. Item de configuração: "
+"<literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1628,7 +1596,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1641,7 +1609,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:430
+#: apt-get.8.xml:424
 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 "
@@ -1656,7 +1624,7 @@ msgstr ""
 "<literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1677,7 +1645,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 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. "
@@ -1690,7 +1658,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:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1699,7 +1667,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 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 "
@@ -1716,7 +1684,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:472
+#: apt-get.8.xml:466
 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 "
@@ -1739,7 +1707,7 @@ msgstr ""
 "Release</literal>; veja também o manual &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1753,7 +1721,7 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1763,7 +1731,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1776,7 +1744,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 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 "
@@ -1795,7 +1763,7 @@ msgstr ""
 "<literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 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</"
@@ -1806,7 +1774,7 @@ msgstr ""
 "Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1815,7 +1783,7 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 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::"
@@ -1826,7 +1794,7 @@ msgstr ""
 "Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1834,31 +1802,31 @@ msgid ""
 "Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
+"Mostra informação de progresso compreensível para o utilizador na janela de "
+"terminal quando os pacotes são instalados, actualizados ou removidos. Para "
+"uma versão \"analisável por máquina\" destes dados veja o  README.progress-"
+"reporting no directório doc do apt. Item de Configuração:  <literal>Dpkg::"
+"Progress</literal> e <literal>Dpkg::Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Ficheiros"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
-#, 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:553
 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;, O guia de utilizadores do The APT em "
-"&guidesdir;, &apt-preferences;, o Howto do APT."
+"&apt-cache;, &apt-cdrom;, &dpkg;, &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><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1867,12 +1835,12 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "pesquisa a cache do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1885,7 +1853,7 @@ msgstr ""
 "a partir dos metadados do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1895,14 +1863,14 @@ msgstr ""
 "estiver em falta ou desactualizada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1926,7 +1894,7 @@ msgstr ""
 "ao seguinte:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1952,7 +1920,7 @@ msgstr ""
 "Fornecimentos Reversos: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -1971,7 +1939,7 @@ msgstr ""
 "consultar o código fonte do apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1980,7 +1948,7 @@ msgstr ""
 "são esperados mais argumentos. As estatísticas reportadas são:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1989,7 +1957,7 @@ msgstr ""
 "encontrados na cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -2002,7 +1970,7 @@ msgstr ""
 "dependências. A maioria dos pacotes caem nesta categoria."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -2019,7 +1987,7 @@ msgstr ""
 "mas não existe um existe um pacote chamado \"mail-transport-agent\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2032,7 +2000,7 @@ msgstr ""
 "pacote, xless, disponibiliza \"X11-text-viewer\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2045,7 +2013,7 @@ msgstr ""
 "um pacote real, como também disponibilizado pelo pacote debconf-tiny."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2061,7 +2029,7 @@ msgstr ""
 "declarações de Conflitos ou Breaks."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -2076,7 +2044,7 @@ msgstr ""
 "consideravelmente maior que o número do total de nomes de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2085,7 +2053,7 @@ msgstr ""
 "dependências reivindicadas por todos os pacotes na cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2097,7 +2065,7 @@ msgstr ""
 "pacote binário."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2106,7 +2074,7 @@ msgstr ""
 "cache. É principalmente para depuração."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2116,7 +2084,7 @@ msgstr ""
 "&dselect;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2125,7 +2093,7 @@ msgstr ""
 "insatisfeitas na cache do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2134,12 +2102,12 @@ msgstr ""
 "print-avail</command>; mostra os registos do pacote para os pacotes nomeados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2160,7 +2128,7 @@ msgstr ""
 "então não há procura na descrição longa, apenas no nome do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2169,7 +2137,7 @@ msgstr ""
 "busca os quais são lidados em conjunto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2179,7 +2147,7 @@ msgstr ""
 "dependência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2188,12 +2156,12 @@ msgstr ""
 "que um pacote tem."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -2208,7 +2176,7 @@ msgstr ""
 "opção <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -2219,7 +2187,7 @@ msgstr ""
 "também são listados na lista gerada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2240,7 +2208,7 @@ msgstr ""
 "defina a opção <literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2254,14 +2222,14 @@ msgstr ""
 "dependências, linhas verdes são conflitos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de "
 "pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2271,12 +2239,12 @@ msgstr ""
 "VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -2289,7 +2257,7 @@ msgstr ""
 "acerca da selecção de prioridade do pacote nomeado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -2308,7 +2276,7 @@ msgstr ""
 "Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2319,7 +2287,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2334,7 +2302,7 @@ msgstr ""
 "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2348,7 +2316,7 @@ msgstr ""
 "Configuração: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2360,7 +2328,7 @@ msgstr ""
 "Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2375,7 +2343,7 @@ msgstr ""
 "replaceable></literal> ex. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2384,7 +2352,7 @@ msgstr ""
 "<literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2401,7 +2369,7 @@ msgstr ""
 "Configuração: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2413,7 +2381,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2422,7 +2390,7 @@ msgstr ""
 "Configuração: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2433,7 +2401,7 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2444,7 +2412,7 @@ msgstr ""
 "Configuração <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2455,12 +2423,12 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2469,12 +2437,12 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "Utilitário de gestão de chaves do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -2485,12 +2453,12 @@ msgstr ""
 "estas chaves serão considerados de confiança."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Comandos"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2501,32 +2469,32 @@ msgstr ""
 "se o nome do ficheiro for <literal>-</literal> a partir da entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "Remove uma chave da lista de chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Escreve o &synopsis-param-keyid; da chave na saída standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "Escreve todas as chaves de confiança na saída standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "Lista as chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "Lista as fingerprints das chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2535,7 +2503,7 @@ msgstr ""
 "chave pública."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2548,7 +2516,7 @@ msgstr ""
 "por exemplo o pacote &keyring-package; em &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2566,12 +2534,12 @@ msgstr ""
 "lo."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Opções"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2580,7 +2548,7 @@ msgstr ""
 "secção prévia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2597,48 +2565,48 @@ msgstr ""
 "chaves são adicionadas a este."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "Base de dados local de confiança de chaves de arquivos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Chaveiro das chaves de confiança dos arquivos &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Chaveiro das chaves de confiança removidas dos arquivos &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2647,7 +2615,7 @@ msgstr ""
 "sendo instalado automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -2663,7 +2631,7 @@ msgstr ""
 "command> ou <command>aptitude</command> (exemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2674,7 +2642,7 @@ msgstr ""
 "pacote instalado manualmente depender deste pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2685,7 +2653,7 @@ msgstr ""
 "se nenhum outro pacote depender dele."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2700,7 +2668,7 @@ msgstr ""
 "pela opção <option>--file</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2709,7 +2677,7 @@ msgstr ""
 "definido num pacote para permitir de novo todas as acções."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2723,7 +2691,7 @@ msgstr ""
 "automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2734,7 +2702,7 @@ msgstr ""
 "instalados manualmente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2743,7 +2711,7 @@ msgstr ""
 "retenção do mesmo modo que os outros comandos show."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2756,7 +2724,7 @@ msgstr ""
 "directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2765,12 +2733,12 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "Suporte de autenticação de arquivos para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -2783,7 +2751,7 @@ msgstr ""
 "não têm acesso à chave de assinatura do ficheiro Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 msgid ""
 "If a package comes from a archive without a signature, or with a signature "
 "that apt does not have a key for, that package is considered untrusted, and "
@@ -2799,7 +2767,7 @@ msgstr ""
 "verificadas antes de descarregar pacotes delas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2808,12 +2776,12 @@ msgstr ""
 "nova funcionalidade de autenticação."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Arquivos de confiança"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2830,7 +2798,7 @@ msgstr ""
 "assegurar que a integridade do arquivo está correcta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2843,7 +2811,7 @@ msgstr ""
 "verify e devscripts respectivamente)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. In order to become "
@@ -2861,7 +2829,7 @@ msgstr ""
 "para assegurar a identidade do dono da chave."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2883,7 +2851,7 @@ msgstr ""
 "package;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2895,7 +2863,7 @@ msgstr ""
 "confiar no APT que faz isto automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2904,7 +2872,7 @@ msgstr ""
 "desenhado para prevenir dois ataques possíveis:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2919,7 +2887,7 @@ msgstr ""
 "um servidor impostor (através de ataques de fraude de ARP ou DNS)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2932,7 +2900,7 @@ msgstr ""
 "descarregam pacotes a partir dessa máquina."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2945,12 +2913,12 @@ msgstr ""
 "mecanismo pode complementar uma assinatura por-pacote."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Configuração do utilizador"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys, although an installation of "
@@ -2964,7 +2932,7 @@ msgstr ""
 "pacotes Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2981,12 +2949,12 @@ msgstr ""
 "<filename>Release.gpg</filename> dos arquivos que você configurou."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Configuração de arquivos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2995,7 +2963,7 @@ msgstr ""
 "manutenção, você tem que:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -3006,7 +2974,7 @@ msgstr ""
 "command> (disponibilizado no apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -3017,7 +2985,7 @@ msgstr ""
 "gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -3028,7 +2996,7 @@ msgstr ""
 "autenticar os ficheiros no arquivo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3039,16 +3007,16 @@ msgstr ""
 "previamente delineados."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3065,12 +3033,12 @@ msgstr ""
 "ulink> de V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Autores do manual"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -3079,12 +3047,12 @@ msgstr ""
 "Jones, Colin Walters, Florian Weimer e Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "Utilitário de gestão de CD-ROM do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3097,7 +3065,7 @@ msgstr ""
 "e verificar os ficheiros de índice."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -3109,7 +3077,7 @@ msgstr ""
 "conta possíveis falhas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3124,7 +3092,7 @@ msgstr ""
 "lhe-à pedido um título descritivo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3135,7 +3103,7 @@ msgstr ""
 "list</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3144,24 +3112,18 @@ msgstr ""
 "assim como o nome de ficheiro armazenado"
 
 #. 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>."
+#: apt-cdrom.8.xml:81
 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 ""
-"Ponto de Montagem; especifica a localização para montar o cdrom. Este ponto "
-"de montagem deve estar listado em <filename>/etc/fstab</filename> e "
-"configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::"
-"mount</literal>."
+"Não tente a auto-detecção do caminho do CD-ROM. Normalmente combinada com a "
+"opção <option>--cdrom</option>.  Item de Configuração: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 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.  "
@@ -3173,7 +3135,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3185,7 +3147,7 @@ msgstr ""
 "CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3196,7 +3158,7 @@ msgstr ""
 "NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3209,7 +3171,7 @@ msgstr ""
 "configuração: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3220,7 +3182,7 @@ msgstr ""
 "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3231,12 +3193,12 @@ msgstr ""
 "configuração: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3245,12 +3207,12 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "Programa de Consulta de Configuração do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3263,7 +3225,7 @@ msgstr ""
 "um modo que é fácil de usar para aplicações em script."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -3278,7 +3240,7 @@ msgstr ""
 "script shell deverá ser usado como se segue:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3290,7 +3252,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3299,7 +3261,7 @@ msgstr ""
 "options com uma predefinição de <option>-f</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -3311,12 +3273,12 @@ msgstr ""
 "verificado internamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Apenas mostra o conteúdo do espaço de configuração."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3325,12 +3287,12 @@ msgstr ""
 "empty para removê-las dos resultados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3348,13 +3310,13 @@ msgstr ""
 "pode ser escrito ao usar &percnt;&percnt;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3363,27 +3325,27 @@ msgstr ""
 "em erro."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Documentação inicial do Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "Ficheiro de configuração para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3397,7 +3359,7 @@ msgstr ""
 "para disponibilizar um ambiente uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3406,7 +3368,7 @@ msgstr ""
 "seguinte ordem:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3415,7 +3377,7 @@ msgstr ""
 "(se existir)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3434,7 +3396,7 @@ msgstr ""
 "literal> - que então nesse caso será ignorado em silêncio."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3442,7 +3404,7 @@ msgstr ""
 "main</literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3451,12 +3413,12 @@ msgstr ""
 "configuração ou para carregar mais ficheiros de configuração."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Sintaxe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3471,7 +3433,7 @@ msgstr ""
 "ferramenta Get. A opções não herdam dos seus grupos parentes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3496,7 +3458,7 @@ msgstr ""
 "\"/-:._+\". Um novo scope pode ser aberto com chavetas, assim:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3514,7 +3476,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -3526,13 +3488,13 @@ msgstr ""
 "por um ponto e vírgula (;)."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3541,7 +3503,7 @@ msgstr ""
 "guia de como deve ficar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3551,7 +3513,7 @@ msgstr ""
 "pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3567,7 +3529,7 @@ msgstr ""
 "opção."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3587,7 +3549,7 @@ msgstr ""
 "acabar com um 'ponto e vírgula' (;) .)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3603,7 +3565,7 @@ msgstr ""
 "sobrepostos, apenas limpos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3622,7 +3584,7 @@ msgstr ""
 "ser usada na linha de comandos.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3652,12 +3614,12 @@ msgstr ""
 "explicitamente delas."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "O Grupo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3666,7 +3628,7 @@ msgstr ""
 "as opções para todas as ferramentas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3677,7 +3639,7 @@ msgstr ""
 "qual o APT foi compilado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3699,16 +3661,20 @@ msgstr ""
 "<command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 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 ""
+"Lista todos os perfis de compilação activos para resolução de dependências "
+"de compilação, sem o prefixo \"<literal>profile.</literal>\" no espaço do "
+"nome. Por predefinição esta lista está vazia. O <envar>DEB_BUILD_PROFILES</"
+"envar> usado pelo &dpkg-buildpackage; sobrepõe a notação da lista."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3721,7 +3687,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:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3730,7 +3696,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:201
+#: apt.conf.5.xml:195
 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 "
@@ -3744,7 +3710,7 @@ msgstr ""
 "directo de os reinstalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 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 "
@@ -3771,7 +3737,7 @@ msgstr ""
 "de A não está mais satisfeita."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3800,7 +3766,7 @@ msgstr ""
 "que pode ajudar a prevenir."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 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 "
@@ -3817,7 +3783,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:245
+#: apt.conf.5.xml:239
 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 "
@@ -3838,7 +3804,7 @@ msgstr ""
 "command> ou nada de que esses pacotes dependam."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 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 "
@@ -3875,13 +3841,13 @@ msgstr ""
 "da cache é desactivado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 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:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3890,7 +3856,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:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3899,7 +3865,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:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3908,12 +3874,12 @@ msgstr ""
 "documentação para mais informação acerca das opções de aqui."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "O Grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3924,7 +3890,7 @@ msgstr ""
 "descarga (veja também &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3946,7 +3912,7 @@ msgstr ""
 "seguinte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3966,7 +3932,7 @@ msgstr ""
 "nome da opção."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3986,7 +3952,7 @@ msgstr ""
 "arquivo ao nome da opção."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3997,7 +3963,7 @@ msgstr ""
 "por inteiro. Verdadeiro por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 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 "
@@ -4015,7 +3981,7 @@ msgstr ""
 "completo em vez das patches."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4030,7 +3996,7 @@ msgstr ""
 "aberta uma ligação por tipo de URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4039,7 +4005,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:364
+#: apt.conf.5.xml:358
 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."
@@ -4049,7 +4015,7 @@ msgstr ""
 "A predefinição é verdadeiro."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 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]/</"
@@ -4068,7 +4034,7 @@ msgstr ""
 "variável de ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 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 "
@@ -4088,7 +4054,7 @@ msgstr ""
 "(grandes) ficheiros .deb."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 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."
@@ -4098,7 +4064,7 @@ msgstr ""
 "dados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 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."
@@ -4117,7 +4083,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:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4126,14 +4092,7 @@ msgstr ""
 "os redireccionamentos, o que está activo por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
-#, 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:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4142,13 +4101,13 @@ msgid ""
 "multiple servers at the same time."
 msgstr ""
 "A largura de banda usada pode ser limitada com <literal>Acquire::http::Dl-"
-"Limit</literal> que aceita valores inteiros em kilobytes. O valor "
-"predefinido é 0 que desactiva o limite e tenta usar toda a largura de banda "
-"disponível (note que esta opção implicitamente desactiva a descarga a partir "
-"de múltiplos servidores ao mesmo tempo.)"
+"Limit</literal> que aceita valores inteiros em kilobytes por segundo. O "
+"valor predefinido é 0 que desactiva o limite e tenta usar toda a largura de "
+"banda disponível. Note que esta opção implicitamente desactiva a descarga a "
+"partir de múltiplos servidores ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4160,7 +4119,7 @@ msgstr ""
 "identificador conhecido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 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 "
@@ -4172,9 +4131,18 @@ msgid ""
 "takes precedence over the legacy option name <literal>ProxyAutoDetect</"
 "literal>."
 msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> pode ser usado para "
+"especificar um comando externo para descobrir o proxy http a usar. O apt "
+"espera que o comando forneça o resultado do proxy no stdout ao estilo "
+"<literal>http://proxy:port/</literal>. Isto irá sobrepor o <literal>Acquire::"
+"http::Proxy</literal> genérico mas não qualquer configuração especifica da "
+"máquina proxy definida via <literal>Acquire::http::Proxy::$HOST</literal>. "
+"Veja o pacote &squid-deb-proxy-client; para um exemplo de implementação que "
+"usa avahi. Esta opção toma precedência sobre o nome de opção antigo "
+"<literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4191,7 +4159,7 @@ msgstr ""
 "literal> ainda não é suportada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4230,7 +4198,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:458
+#: apt.conf.5.xml:452
 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]/</"
@@ -4264,7 +4232,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4280,7 +4248,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:485
+#: apt.conf.5.xml:479
 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 "
@@ -4294,7 +4262,7 @@ msgstr ""
 "eficiência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4309,13 +4277,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:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4336,7 +4304,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:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4345,13 +4313,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:523
+#: apt.conf.5.xml:517
 #, 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:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4370,19 +4338,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:528
+#: apt.conf.5.xml:522
 #, 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:531
+#: apt.conf.5.xml:525
 #, 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:524
+#: apt.conf.5.xml:518
 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 "
@@ -4414,13 +4382,13 @@ msgstr ""
 "automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, 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:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4446,7 +4414,7 @@ msgstr ""
 "prefixar a lista com este tipo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4458,7 +4426,7 @@ msgstr ""
 "maioritariamente apenas para mirrors locais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4471,7 +4439,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:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4491,13 +4459,13 @@ msgstr ""
 "especialmenteraros."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, 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:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4536,7 +4504,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4550,22 +4518,22 @@ msgstr ""
 "literal>\" implícito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
-msgstr ""
+msgstr "Ao descarregar, força o uso exclusivo do protocolo IPv4."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
-msgstr ""
+msgstr "Ao descarregar, força o uso exclusivo do protocolo IPv6."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "Directórios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4584,29 +4552,30 @@ msgstr ""
 "items que não começam com <filename>/</filename> ou <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contém localizações pertencentes a informação "
 "da cache local, como as caches de dois pacotes <literal>srcpkgcache</"
 "literal> e <literal>pkgcache</literal> assim como a localização onde colocar "
 "arquivos descarregados, <literal>Dir::Cache::archives</literal>. A geração "
-"de caches pode ser desligada ao definir os seus nomes para uma string vazia. "
-"Isto irá abrandar o arranque mas poupar espaço em disco. Provavelmente é "
-"preferível desligar o pkgcache em vez do srcpkgcache. Tal como <literal>Dir::"
-"State</literal> o directório predefinido é contido em <literal>Dir::Cache</"
-"literal>"
+"de caches pode ser desligada ao definir <literal>pkgcache</literal> ou "
+"<literal>srcpkgcache</literal> para <literal>\"\"</literal>. Isto irá "
+"abrandar o arranque mas poupar espaço em disco. Provavelmente é preferível "
+"desligar o pkgcache em vez do srcpkgcache. Tal como <literal>Dir::State</"
+"literal> o directório predefinido é contido em <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4621,7 +4590,7 @@ msgstr ""
 "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4632,7 +4601,7 @@ msgstr ""
 "estar feito então é carregado o ficheiro de configuração principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4650,7 +4619,7 @@ msgstr ""
 "respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4671,7 +4640,7 @@ msgstr ""
 "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4689,12 +4658,12 @@ msgstr ""
 "expressão regular."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "APT em DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4705,7 +4674,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4727,7 +4696,7 @@ msgstr ""
 "pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4736,7 +4705,7 @@ msgstr ""
 "comandos quando é corrido para a fase de instalação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: 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 update phase."
@@ -4745,7 +4714,7 @@ msgstr ""
 "comandos quando é executado para a fase de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4754,12 +4723,12 @@ msgstr ""
 "continuar. A predefinição é avisar apenas em caso de erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "Como o APT chama o &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4768,7 +4737,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:699
+#: apt.conf.5.xml:694
 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 "
@@ -4779,7 +4748,7 @@ msgstr ""
 "um argumento único ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4792,14 +4761,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:712
-#, 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:707
 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 "
@@ -4813,17 +4775,11 @@ msgstr ""
 "notação listada. Os  comandos são invocados em ordem usando <filename>/bin/"
 "sh</filename>, caso algum deles falhe, o APT irá abortar. O APT irá passar "
 "para os comandos os nomes de ficheiros de todos os ficheiros .deb que vai "
-"instalar, um por cada linha na entrada standard."
+"instalar, um por cada linha no descritor de ficheiro requisitado, usando por "
+"predefinição a entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
-#, 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:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4832,12 +4788,11 @@ msgid ""
 msgstr ""
 "A versão 2 deste protocolo despeja mais informação, incluindo a versão de "
 "protocolo, o espaço de configuração do APT e os pacotes, ficheiros e versões "
-"que foram alteradas. A versão 2 é activada ao definir <literal>DPkg::Tools::"
-"options::cmd::Version</literal> a 2. <literal>cmd</literal> é um comando "
-"dado ao <literal>Pre-Install-Pkgs</literal>."
+"que foram alteradas. A versão 3 adiciona a arquitectura e a bandeira "
+"<literal>MultiArch</literal> a cada versão a ser despejada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4846,9 +4801,14 @@ msgid ""
 "the requested version it will send the information in the highest version it "
 "has support for instead."
 msgstr ""
+"A versão do protocolo a ser usado para o comando <literal><replaceable>cmd</"
+"replaceable></literal> pode ser escolhida ao definir <literal>DPkg::Tools::"
+"options::<replaceable>cmd</replaceable>::Version</literal> correctamente, "
+"sendo a predefinição a versão 1. Se o APT não suportar a versão requisitada "
+"irá então enviar a informação na versão mais alta que suporta."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4857,9 +4817,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 ""
+"O descritor de ficheiro a ser usado para enviar a informação pode ser "
+"requisitado com <literal>DPkg::Tools::options::<replaceable>cmd</"
+"replaceable>::InfoFD</literal> o qual usa <literal>0</literal> por "
+"predefinição para a saída standard e está disponível desde a versão 0.9.11. "
+"como confirmação pode ser detectado o suporte para a opção ao observar a "
+"variável de ambiente <envar>APT_HOOK_INFO_FD</envar> que contém o número do "
+"descritor de ficheiro usado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4868,7 +4835,7 @@ msgstr ""
 "predefinição é <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4877,12 +4844,12 @@ msgstr ""
 "predefinição é desactivar a assinatura e produzir todos os binários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 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:752
+#: apt.conf.5.xml:747
 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 "
@@ -4908,7 +4875,7 @@ msgstr ""
 "100% enquanto na realidade está a configurar todos os pacotes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4922,7 +4889,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4946,7 +4913,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4968,7 +4935,7 @@ msgstr ""
 "chamadas unpack e remove."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4998,7 +4965,7 @@ msgstr ""
 "arrancar."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5016,7 +4983,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:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5032,7 +4999,7 @@ msgstr ""
 "configurar este pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5050,7 +5017,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 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 "
@@ -5074,12 +5041,12 @@ msgstr ""
 "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Opções Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5092,12 +5059,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:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "Opções de depuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5114,7 +5081,7 @@ msgstr ""
 "interesse para o utilizador normal, mas algumas podem ter:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5125,7 +5092,7 @@ msgstr ""
 "remove, purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5136,7 +5103,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:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5148,7 +5115,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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5157,12 +5124,12 @@ msgstr ""
 "IDs de CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 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:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5170,25 +5137,25 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 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:918
+#: apt.conf.5.xml:913
 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:929
+#: apt.conf.5.xml:924
 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:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5197,7 +5164,7 @@ msgstr ""
 "criptográficas usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5206,13 +5173,13 @@ msgstr ""
 "armazenados em CD-ROMs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 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:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5221,7 +5188,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5232,7 +5199,7 @@ msgstr ""
 "para um CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5242,14 +5209,14 @@ msgstr ""
 "literal></quote> ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 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:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5258,7 +5225,7 @@ msgstr ""
 "checksums e assinaturas criptográficas dos ficheiros descarregados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5268,7 +5235,7 @@ msgstr ""
 "pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5277,7 +5244,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:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5285,7 +5252,7 @@ msgstr ""
 "downloads."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5294,7 +5261,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:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5309,7 +5276,7 @@ msgstr ""
 "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5340,7 +5307,7 @@ msgstr ""
 "pacote aparece."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5350,7 +5317,7 @@ msgstr ""
 "único."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5359,7 +5326,7 @@ msgstr ""
 "estado e quaisquer erros encontrados enquanto os analisa."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5368,7 +5335,7 @@ msgstr ""
 "literal> deve passar os pacotes ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5376,12 +5343,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 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:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5390,7 +5357,7 @@ msgstr ""
 "acontece quando é encontrado um problema de dependências complexo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5401,7 +5368,7 @@ msgstr ""
 "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5410,21 +5377,24 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 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 ""
+"Mostra os comandos externos que são chamados por hooks do apt. Isto inclui "
+"por exemplo as opções de configuração <literal>DPkg::{Pre,Post}-Invoke</"
+"literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5434,17 +5404,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "Ficheiro de controle de preferências para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5457,7 +5427,7 @@ msgstr ""
 "ser seleccionadas para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5479,7 +5449,7 @@ msgstr ""
 "para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -5494,7 +5464,7 @@ msgstr ""
 "escolha da instância, apenas a escolha da versão."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -5518,7 +5488,7 @@ msgstr ""
 "foi avisado."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5540,24 +5510,24 @@ msgstr ""
 "em silêncio."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "Atribuições de Prioridade Predefinidas do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -5585,7 +5555,7 @@ msgstr ""
 "\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
@@ -5594,12 +5564,12 @@ msgstr ""
 "algoritmo para definir as prioridades das versões de um pacote. Atribuir:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "priority 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5612,12 +5582,12 @@ msgstr ""
 "<literal>experimental</literal> da Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "priority 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5630,12 +5600,12 @@ msgstr ""
 "backports da Debian desde <literal>squeeze-backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "priority 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -5644,19 +5614,19 @@ msgstr ""
 "destinado."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "priority 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
 "para as versões que não estão instaladas e pertencem ao lançamento destinado."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -5674,7 +5644,7 @@ msgstr ""
 "yes\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5683,7 +5653,7 @@ msgstr ""
 "para determinar qual versão de um pacote deve instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5699,12 +5669,12 @@ msgstr ""
 "arriscado.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "Instala a versão de prioridade mais alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5713,7 +5683,7 @@ msgstr ""
 "(isto é, aquela com o número de versão mais alto)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5724,7 +5694,7 @@ msgstr ""
 "reinstall</literal> é fornecida, instala a que foi desinstalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5739,7 +5709,7 @@ msgstr ""
 "replaceable></command> ou <command>apt-get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5753,7 +5723,7 @@ msgstr ""
 "get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5772,12 +5742,12 @@ msgstr ""
 "prioridade mais alta que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "O Efeito das Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5790,7 +5760,7 @@ msgstr ""
 "um ou dois formatos, um formato específico e um formato geral."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5807,7 +5777,7 @@ msgstr ""
 "por espaços."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5819,7 +5789,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -5834,7 +5804,7 @@ msgstr ""
 "nome de domínio totalmente qualificado do site."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -5846,7 +5816,7 @@ msgstr ""
 "local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5858,7 +5828,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -5871,7 +5841,7 @@ msgstr ""
 "servidor identificadas pelo nome de máquina \"ftp.de.debian.org\""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5883,7 +5853,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5898,7 +5868,7 @@ msgstr ""
 "como \"Debian\" ou \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5909,7 +5879,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5921,7 +5891,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5932,7 +5902,7 @@ msgstr ""
 "\"<literal>&testing-codename;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5944,7 +5914,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5956,7 +5926,7 @@ msgstr ""
 "version;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5968,12 +5938,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Expressões regulares e sintaxe &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -5988,7 +5958,7 @@ msgstr ""
 "regular extensa do POSIX rodeada de barras)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -6000,7 +5970,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6011,7 +5981,7 @@ msgstr ""
 "a todos os pacotes de um lançamento que começa com &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6023,7 +5993,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6041,12 +6011,12 @@ msgstr ""
 "considerado uma expressão &glob; em si próprio."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta as Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6056,12 +6026,12 @@ msgstr ""
 "(falando grosso):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6070,12 +6040,12 @@ msgstr ""
 "na versão do pacote (downgrade)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6084,12 +6054,12 @@ msgstr ""
 "destino, a menos que a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -6099,12 +6069,12 @@ msgstr ""
 "mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -6114,12 +6084,12 @@ msgstr ""
 "recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -6128,17 +6098,17 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "previne a instalação da versão"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6152,7 +6122,7 @@ msgstr ""
 "determina a prioridade da versão de pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6161,7 +6131,7 @@ msgstr ""
 "registos apresentados atrás:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6189,12 +6159,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Então:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -6209,7 +6179,7 @@ msgstr ""
 "perl;*, então será feito um downgrade ao <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6220,7 +6190,7 @@ msgstr ""
 "versões, mesmo versões que pertencem ao lançamento de destino."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6233,12 +6203,12 @@ msgstr ""
 "instalação e se nenhuma versão do pacote já estiver instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6249,7 +6219,7 @@ msgstr ""
 "descrever os pacotes disponíveis nessa localização."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6269,27 +6239,27 @@ msgstr ""
 "definir prioridades do APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "fornece o nome do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "fornece o número de versão do pacote nomeado"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6311,12 +6281,12 @@ msgstr ""
 "APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6333,18 +6303,18 @@ msgstr ""
 "requerer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "a linha <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6361,13 +6331,13 @@ msgstr ""
 "preferências do APT requer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6384,7 +6354,7 @@ msgstr ""
 "seguintes linhas:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6396,12 +6366,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6419,18 +6389,18 @@ msgstr ""
 "a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6443,18 +6413,18 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6467,13 +6437,13 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6498,12 +6468,12 @@ msgstr ""
 "literal> da distribuição <literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Linhas Opcionais num Registo de Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6514,12 +6484,12 @@ msgstr ""
 "literal>. Isto disponibiliza um espaço para comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Acompanhando Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6543,7 +6513,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6559,8 +6529,8 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6572,7 +6542,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6585,13 +6555,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6604,12 +6574,12 @@ msgstr ""
 "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6637,7 +6607,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6654,7 +6624,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6667,13 +6637,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6692,12 +6662,12 @@ msgstr ""
 "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Acompanhando a evolução de um nome de código de lançamento"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6731,7 +6701,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6757,7 +6727,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6770,13 +6740,13 @@ msgstr ""
 "codename;</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6795,17 +6765,17 @@ msgstr ""
 "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "Lista das fontes de dados APT configuradas"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6822,7 +6792,7 @@ msgstr ""
 "comando equivalente de outra interface \"front-end\" do APT)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6837,12 +6807,12 @@ msgstr ""
 "numa linha marca o restante dessa linha como um comentário."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -6864,12 +6834,12 @@ msgstr ""
 "neste caso serão ignorados em silêncio."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "Os tipos deb e deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6894,7 +6864,7 @@ msgstr ""
 "linha <literal>deb-src</literal> para obter índices das fontes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6903,14 +6873,13 @@ msgstr ""
 "tipos <literal>deb</literal> e <literal>deb-src</literal> é:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
-#, fuzzy, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:76
+#, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ opções ] uri distribuição [componente1] [componente2] [...]"
+msgstr "deb [ opções ] uri suite [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6931,26 +6900,35 @@ msgid ""
 "     [option1]: [option1-value]\n"
 "   "
 msgstr ""
+"     Tipos: deb deb-src\n"
+"     URIs: http://exemplo.com\n"
+"     Suites: stable testing\n"
+"     Secções: component1 component2\n"
+"     Descrição: curta\n"
+"      longa longa longa\n"
+"     [opção1]: [opção1-valor]\n"
+"\n"
+"     Tipos: deb\n"
+"     URIs: http://outro.exemlo.com\n"
+"     Suites: experimental\n"
+"     Secções: component1 component2\n"
+"     Activo: não\n"
+"     Descrição: curta\n"
+"      longa longa longa\n"
+"     [opção1]: [opção1-valor]\n"
+"   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
+"Em alternativa, é também suportado um formato estilo 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."
+#: sources.list.5.xml:99
 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.  "
@@ -6963,25 +6941,15 @@ msgid ""
 msgstr ""
 "O URI para o tipo <literal>deb</literal> tem de especificar a base da "
 "distribuição Debian, a partir do qual o APT irá encontrar a informação que "
-"precisa. <literal>distribution</literal> pode especificar um caminho exacto, "
-"que no caso os componente têm de ser omitidos e <literal>distribution</"
-"literal> deve terminar com uma barra (<literal>/</literal>). Isto é útil "
-"para o caso de apenas ser de interesse uma sub-secção particular do arquivo "
-"denotado pelo URI. Se <literal>distribution</literal> não especificar um "
-"caminho exacto, pelo menos um <literal>component</literal> tem de estar "
-"presente."
+"precisa. <literal>suite</literal> pode especificar um caminho exacto, que no "
+"caso os componente têm de ser omitidos e <literal>suite</literal> deve "
+"terminar com uma barra (<literal>/</literal>). Isto é útil para o caso de "
+"apenas ser de interesse uma sub-secção particular do arquivo denotado pelo "
+"URI. Se <literal>suite</literal> não especificar um caminho exacto, pelo "
+"menos um <literal>component</literal> tem de estar presente."
 
 #. 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."
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -6991,29 +6959,16 @@ msgid ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
-"<literal>distribution</literal> também pode conter uma variável. <literal>"
-"$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como "
-"<literal>amd64</literal> ou <literal>armel</literal>) usada no sistema. Isto "
-"permite que seja usados ficheiros <filename>sources.list</filename> "
-"independentes da arquitectura. Em geral, isto é apenas de interesse quando "
-"se especifica um caminho exacto. De outro modo o <literal>APT</literal> irá "
-"gerar automaticamente um URI com a arquitectura actual."
+"<literal>suite</literal> também pode conter uma variável. <literal>$(ARCH)</"
+"literal> a qual se expande à arquitectura Debian (tal como <literal>amd64</"
+"literal> ou <literal>armel</literal>) usada no sistema. Isto permite que "
+"seja usados ficheiros <filename>sources.list</filename> independentes da "
+"arquitectura. Em geral, isto é apenas de interesse quando se especifica um "
+"caminho exacto. De outro modo o <literal>APT</literal> irá gerar "
+"automaticamente um URI com a arquitectura actual."
 
 #. 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."
+#: sources.list.5.xml:116
 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 "
@@ -7027,20 +6982,21 @@ msgid ""
 "users. APT also parallelizes connections to different hosts to more "
 "effectively deal with sites with low bandwidth."
 msgstr ""
-"Como apenas pode ser especificada por linha uma distribuição, pode ser "
-"necessário ter várias linhas para o mesmo URI, se só for desejado um sub-"
-"conjunto de todas as distribuições e componentes dessa localização. O APT "
-"irá ordenar a lista de URI após ter gerado internamente um conjunto "
-"completo, e irá desabar as várias referências à mesma máquina na Internet, "
-"por exemplo, numa única ligação, para que não estabeleça uma ligação FTP "
-"ineficiente, a feche, faça outra coisa, e depois volte a estabelecer ligação "
-"à mesma máquina. Esta funcionalidade é útil para aceder a sites FTP ocupados "
-"que limitam o número de utilizadores anónimos em simultâneo. O APT também "
-"paraleliza ligações a máquinas diferentes para lidar mais eficientemente com "
-"sites com baixa largura de banda."
+"No estilo tradicional, o formato do sources.list, como apenas pode ser "
+"especificada por linha uma distribuição, pode ser necessário ter várias "
+"linhas para o mesmo URI, se só for desejado um sub-conjunto de todas as "
+"distribuições e componentes dessa localização. O APT irá ordenar a lista de "
+"URI após ter gerado internamente um conjunto completo, e irá desabar as "
+"várias referências à mesma máquina na Internet, por exemplo, numa única "
+"ligação, para que não estabeleça uma ligação FTP ineficiente, a feche, faça "
+"outra coisa, e depois volte a estabelecer ligação à mesma máquina. Esta "
+"funcionalidade é útil para aceder a sites FTP ocupados que limitam o número "
+"de utilizadores anónimos em simultâneo. O APT também paraleliza ligações a "
+"máquinas diferentes para lidar mais eficientemente com sites com largura de "
+"banda baixa."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -7057,7 +7013,7 @@ msgstr ""
 "definições não suportadas serão ignoradas em silêncio):"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7072,28 +7028,20 @@ msgstr ""
 "<literal>APT::Architectures</literal>."
 
 #. 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."
+#: sources.list.5.xml:140
 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> pode ser usado para especificar para quais "
-"arquitecturas deve ser descarregada a informação. Se esta opção não estiver "
-"definida, serão descarregadas todas as arquitecturas definidas pela opção "
-"<literal>APT::Architectures</literal>."
+"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> e <literal>arch-=<replaceable>arch1</replaceable>,"
+"<replaceable>arch2</replaceable>,…</literal> que podem ser usadas para "
+"adicionar/remover arquitecturas do conjunto que será descarregado."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -7110,7 +7058,7 @@ msgstr ""
 "lida com fontes mesmo actualmente autenticadas como não sendo autênticas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -7124,12 +7072,12 @@ msgstr ""
 "Internet, por exemplo)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Alguns exemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7141,17 +7089,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "Especificação da URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "Os tipos de URI actualmente reconhecidos são:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7162,7 +7110,7 @@ msgstr ""
 "arquivos locais."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7172,7 +7120,7 @@ msgstr ""
 "fontes."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7189,7 +7137,7 @@ msgstr ""
 "método de autenticação seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7210,7 +7158,7 @@ msgstr ""
 "configuração serão ignorados."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -7223,7 +7171,7 @@ msgstr ""
 "ficheiros com o APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7237,12 +7185,12 @@ msgstr ""
 "ficheiros a partir da máquina remota."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "adicionando mais tipos de URI reconhecíveis"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7261,7 +7209,7 @@ msgstr ""
 "exemplo o debtorrent - veja &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7270,36 +7218,36 @@ msgstr ""
 "para stable/main, stable/contrib, e stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "Linha de fonte para o referido acima"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7310,7 +7258,7 @@ msgstr ""
 "<literal>amd64</literal> e <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7320,7 +7268,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7329,13 +7277,13 @@ msgstr ""
 "hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7344,13 +7292,13 @@ msgstr ""
 "usa apenas a área &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7363,19 +7311,19 @@ msgstr ""
 "uma única sessão FTP para ambas linhas de recurso."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7394,17 +7342,17 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7413,7 +7361,7 @@ msgstr ""
 "partir de pacotes Debian"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7428,12 +7376,12 @@ msgstr ""
 "gerada uma linha no formato:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "pacote versão ficheiro-modelo script-de-configuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7448,7 +7396,7 @@ msgstr ""
 "<filename>pacote.configuração.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7459,7 +7407,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7468,12 +7416,12 @@ msgstr ""
 "decimal em erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "Utilitário para organizar ficheiros índice de pacotes"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -7486,7 +7434,7 @@ msgstr ""
 "registo de acordo com as regras de organização internas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7494,7 +7442,7 @@ msgstr ""
 "ficheiro pesquisável."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7503,7 +7451,7 @@ msgstr ""
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7512,12 +7460,12 @@ msgstr ""
 "em erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "Utilitário para gerar ficheiros de índice"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -7530,7 +7478,7 @@ msgstr ""
 "baseados no conteúdo desse site."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7545,7 +7493,7 @@ msgstr ""
 "script o processo de geração para um arquivo completo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -7560,7 +7508,7 @@ msgstr ""
 "ficheiros e constrói os ficheiros comprimidos desejados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7573,7 +7521,7 @@ msgstr ""
 "Este comando é aproximadamente equivalente ao &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7581,7 +7529,7 @@ msgstr ""
 "dados de cache binária."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7594,7 +7542,7 @@ msgstr ""
 "Este comando é aproximadamente equivalente ao &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -7606,7 +7554,7 @@ msgstr ""
 "fonte que irá ser usado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7624,7 +7572,7 @@ msgstr ""
 "por uma vírgula na saída."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7648,7 +7596,7 @@ msgstr ""
 "contém um resultado de MD5, SHA1 e SHA256 para cada ficheiro."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7669,7 +7617,7 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -7685,7 +7633,7 @@ msgstr ""
 "definições requeridas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7695,12 +7643,12 @@ msgstr ""
 "são necessários."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "A Configuração do Generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7717,7 +7665,7 @@ msgstr ""
 "árvore. Isto apenas afecta o modo de como a etiqueta scope é manuseada."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7725,12 +7673,12 @@ msgstr ""
 "abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "Secção <literal>Dir</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7743,7 +7691,7 @@ msgstr ""
 "posteriores para produzir um caminho completo e absoluto."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -7753,17 +7701,17 @@ msgstr ""
 "directório que contém o <filename>ls-LR</filename> e nós da distribuição."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "Especifica a localização dos ficheiros de sobrepor."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "Especifica a localização dos ficheiros de cache"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7772,12 +7720,12 @@ msgstr ""
 "definição <literal>FileList</literal> for usada mais abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "Secção <literal>Default</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7788,7 +7736,7 @@ msgstr ""
 "sobrepor estas predefinições em uma definição por-secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -7801,7 +7749,7 @@ msgstr ""
 "predefinição para todos os esquemas de compressão é '. gzip'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7810,7 +7758,7 @@ msgstr ""
 "pacote. A predefinição é '.deb'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7819,7 +7767,7 @@ msgstr ""
 "controla a compressão para os ficheiros das Fontes."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7828,7 +7776,7 @@ msgstr ""
 "fontes. A predefinição é '.dsc'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7837,7 +7785,7 @@ msgstr ""
 "controla a compressão para os ficheiros de Conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7846,7 +7794,7 @@ msgstr ""
 "controla a compressão para o ficheiro mestre Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7857,7 +7805,7 @@ msgstr ""
 "Links</literal> por secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -7867,7 +7815,7 @@ msgstr ""
 "independentemente do umask."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7878,12 +7826,12 @@ msgstr ""
 "<filename>Translation-en</filename> mestre."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "Secção <literal>TreeDefault</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7894,7 +7842,7 @@ msgstr ""
 "$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -7905,7 +7853,7 @@ msgstr ""
 "alguns dias todos sejam reconstruídos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -7923,7 +7871,7 @@ msgstr ""
 "modo. A predefinição é 10, as unidades são em dias."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7932,7 +7880,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7941,7 +7889,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7950,7 +7898,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7959,7 +7907,7 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7970,7 +7918,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -7981,7 +7929,7 @@ msgstr ""
 "$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -7996,12 +7944,12 @@ msgstr ""
 "ficheiros pacotes todos juntos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr "Define o ficheiro cabeçalho para prefixar a saída de conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8010,7 +7958,7 @@ msgstr ""
 "secções podem partilhar a mesma base de dados."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8022,7 +7970,7 @@ msgstr ""
 "arquivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8035,12 +7983,12 @@ msgstr ""
 "arquivo. Isto é usado quando se processa índices de fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "Secção <literal>Tree</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8055,7 +8003,7 @@ msgstr ""
 "<literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -8068,7 +8016,7 @@ msgstr ""
 "definição tal como <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8079,7 +8027,7 @@ msgstr ""
 "variáveis."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8093,7 +8041,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8104,7 +8052,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8115,7 +8063,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -8126,7 +8074,7 @@ msgstr ""
 "indicar que esta árvore tem um arquivo fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8135,7 +8083,7 @@ msgstr ""
 "informação de secção, prioridade e endereço do responsável."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8144,22 +8092,22 @@ msgstr ""
 "informação de secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "Define o ficheiro de sobreposição extra binário."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "Define o ficheiro de sobreposição extra fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "Secção <literal>BinDirectory</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8174,12 +8122,12 @@ msgstr ""
 "definições <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "Define a saída do ficheiro Packages."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8188,42 +8136,42 @@ msgstr ""
 "<literal>Packages</literal> ou <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "Define a saída do ficheiro Contents (opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "Define o ficheiro de sobreposição binário."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "Define o ficheiro de sobreposição fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "Define a base de dados de cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "Acrescenta um caminho a todos os caminhos de saída."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "Especifica o ficheiro de lista de ficheiros."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "O Ficheiro Binary Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8238,19 +8186,19 @@ msgstr ""
 "permutação do responsável."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8267,12 +8215,12 @@ msgstr ""
 "formato substitui incondicionalmente o campo do responsável."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "O Ficheiro Source Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8283,12 +8231,12 @@ msgstr ""
 "nome de pacote fonte, o segundo é a secção onde o atribuir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "O Ficheiro Extra Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8299,7 +8247,7 @@ msgstr ""
 "pacote, a segunda é a etiqueta e restante da linha é o novo valor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8323,7 +8271,7 @@ msgstr ""
 "<literal>MD5</literal>, <literal>SHA1</literal> ou <literal>SHA256</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8332,7 +8280,7 @@ msgstr ""
 "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -8346,7 +8294,7 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -8359,7 +8307,7 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -8375,7 +8323,7 @@ msgstr ""
 "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8386,7 +8334,7 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8395,7 +8343,7 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8409,7 +8357,7 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8433,7 +8381,7 @@ msgstr ""
 "as verificações extras serão desnecessárias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8448,13 +8396,13 @@ msgstr ""
 "<filename>Translation-en</filename> só pode ser criado no comando generate."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8463,7 +8411,7 @@ msgstr ""
 "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8471,49 +8419,66 @@ msgstr ""
 "<command>apt-ftparchive</command> devolve zero na operação normal, 100 "
 "decimal em erro."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "pt"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "Guia de Utilizador do APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr "Versão &apt-product-version;"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Este documento disponibiliza uma visão geral de como usar o gestor de "
 "pacotes APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr "Aviso de Licença"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
 "published by the Free Software Foundation; either version 2 of the License, "
 "or (at your option) any later version."
 msgstr ""
-"\"APT\" and this document are free software; you can redistribute them and/"
-"or modify them under the terms of the GNU General Public License as "
-"published by the Free Software Foundation; either version 2 of the License, "
-"or (at your option) any later version."
+"\"APT\" e este documento são software livre; você pode distribuí-lo e/ou "
+"modificá-lo sob os termos da GNU General Public License como publicada pela "
+"Free Software Foundation; seja na versão 2 da Licença, ou (por sua opção) "
+"qualquer versão posterior."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8521,31 +8486,31 @@ msgstr ""
 "Para mais detalhes em sistemas Debian, veja o ficheiro /usr/share/common-"
 "licenses/GPL para a licença completa."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "Geral"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"O pacote APT contém actualmente duas secções, o método <prgn>dselect</prgn> "
-"do APT e a interface de utilizador de linha de comandos <prgn>apt-get</"
-"prgn>. Ambos disponibilizam uma maneira de instalar e remover pacotes assim "
-"como descarregar novos pacotes da Internet."
+"O pacote APT contém actualmente duas secções, o método <command>dselect</"
+"command> do APT e a interface de utilizador de linha de comandos "
+"<command>apt-get</command>. Ambos disponibilizam uma maneira de instalar e "
+"remover pacotes assim como descarregar novos pacotes da Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Anatomia do Sistema de Pacotes"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8556,8 +8521,8 @@ msgstr ""
 "limpo e fácil no sistema. A mais proeminente das suas funcionalidades é o "
 "sistema de dependências."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8572,8 +8537,8 @@ msgstr ""
 "médio. Também permite opções em agentes de transporte de mail, servidores X "
 "e mais."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8585,8 +8550,8 @@ msgstr ""
 "simples é que um pacote requer outro pacote seja instalado ao mesmo tempo "
 "para funcionar correctamente."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8598,8 +8563,8 @@ msgstr ""
 "uma dependência simples do GPG. Também, porque é uma extensão do emacs, tem "
 "uma dependência simples do emacs, e sem o emacs é completamente inútil."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8620,8 +8585,8 @@ msgstr ""
 "de mail têm uma dependência de conflito com todos os outros agentes de "
 "transporte de mail."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8641,8 +8606,8 @@ msgstr ""
 "agente de transporte de mail dependem de um mail-transport-agent. Isto pode "
 "adicionar uma grande confusão quando se tenta corrigir pacotes manualmente."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8654,77 +8619,85 @@ msgstr ""
 "problemas com dependências ao disponibilizar um número de algoritmos "
 "automáticos que ajudam a seleccionar os pacotes para instalação."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> fornece uma maneira simples de instalar pacotes a "
-"partir da linha de comandos. Ao contrário do <prgn>dpkg</prgn>, o <prgn>apt-"
-"get</prgn> não compreende os ficheiros .deb, funciona com o nome próprio do "
-"pacote e apenas pode instalar arquivos .deb a partir de uma <em>Source</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"O primeira <footnote><p>se você está a usar um servidor proxy http você tem "
-"que definir a variável de ambiente http_proxy primeiro, veja sources."
-"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</"
-"prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que "
-"ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get "
-"update</tt>. Por exemplo,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> fornece uma maneira simples de instalar pacotes a "
+"partir da linha de comandos. Ao contrário do <command>dpkg</command>, o "
+"<command>apt-get</command> não compreende os ficheiros .deb, funciona com o "
+"nome próprio do pacote e apenas pode instalar arquivos .deb a partir de uma "
+"<emphasis>Source</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"se você está a usar um servidor proxy http você tem que definir a variável "
+"de ambiente http_proxy primeiro, veja sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"O primeira <placeholder type=\"footnote\" id=\"0\"/> coisa que deve ser "
+"feita antes de usar <command>apt-get</command> é obter as listas de pacotes "
+"a partir das <emphasis>Sources</emphasis> para que ele saiba que pacotes "
+"estão disponíveis. Isto é feito com <literal>apt-get update</literal>. Por "
+"exemplo,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr "Uma vez actualizado existem vários comandos que podem ser usados:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "Upgrade irá tentar actualizar gentilmente todo o sistema. Upgrade nunca irá "
 "instalar um pacote novo ou remover um pacote existente, nem nunca irá "
@@ -8732,16 +8705,16 @@ msgstr ""
 "ser usado diariamente para actualizar o sistema com relativa segurança. "
 "Upgrade ira listar todos os pacotes que não pode actualizar, isto geralmente "
 "significa que eles dependem de novos pacotes ou entram em conflito com algum "
-"outro pacote. <prgn>dselect</prgn> ou <tt>apt-get install</tt> podem ser "
-"usados para forçar estes pacotes a instalar."
+"outro pacote. <command>dselect</command> ou <literal>apt-get install</"
+"literal> podem ser usados para forçar estes pacotes a instalar."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8759,33 +8732,34 @@ msgstr ""
 "com os pacotes listados e irá escrever um sumário e pedir confirmação se "
 "algo mais que os seus argumentos serão alterados."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "Dist-upgrade é um actualizador completo desenhado para simplificar a "
 "actualização entre lançamentos da Debian. Usa um algoritmo sofisticado para "
 "determinar o melhor conjunto de pacotes a instalar, actualizar ou remover "
 "para obter o máximo do sistema para o novo lançamento. Em algumas situações "
 "pode ser desejável usar o dist-upgrade em vez de passar o tempo a resolver "
-"dependências manualmente no <prgn>dselect</prgn>. Assim que o dist-upgrade "
-"tiver terminado então pode ser usado o <prgn>dselect</prgn> para instalar "
-"quaisquer pacotes que tenham ficado de fora."
+"dependências manualmente no <command>dselect</command>. Assim que o dist-"
+"upgrade tiver terminado então pode ser usado o <command>dselect</command> "
+"para instalar quaisquer pacotes que tenham ficado de fora."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8793,166 +8767,161 @@ msgstr ""
 "É importante observar de perto o que o dist-upgrade vai fazer, as suas "
 "decisões podem por vezes ser bastante surpreendentes."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, 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 "
-#| "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 "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed 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 used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> tem várias opções de linha de comandos que estão "
-"detalhados no seu manual, <manref section=\"8\" name=\"apt-get\">. A opção "
-"mais útil é <tt>-d</tt> que não instala os pacotes obtidos, Se o sistema "
-"tiver que descarregar um grande número de pacotes seria indesejável começar "
-"a instalá-los no caso de algo correr mal. Quando se usa <tt>-d</tt> os "
-"arquivos descarregados podem ser instalados simplesmente ao correr de novo "
-"comando que s descarregou mas sem o <tt>-d</tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> 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 <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> tem várias opções de linha de comandos que estão "
+"detalhados no seu manual, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. A opção mais útil é "
+"<literal>-d</literal> que não instala os pacotes obtidos, Se o sistema tiver "
+"que descarregar um grande número de pacotes seria indesejável começar a "
+"instalá-los no caso de algo correr mal. Quando se usa <literal>-d</literal> "
+"os arquivos descarregados podem ser instalados simplesmente ao correr de "
+"novo comando que s descarregou mas sem o <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"O método <prgn>dselect</prgn> do APT disponibiliza o sistema APT completo "
-"com a GUI de selecção de pacotes <prgn>dselect</prgn>. O  <prgn>dselect</"
-"prgn> é usado para seleccionar os pacotes a serem instalados ou removidos e "
-"o APT instala-os."
+"O método <command>dselect</command> do APT disponibiliza o sistema APT "
+"completo com a GUI de selecção de pacotes <command>dselect</command>. O  "
+"<command>dselect</command> é usado para seleccionar os pacotes a serem "
+"instalados ou removidos e o APT instala-os."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Para activar o método APT você precisa de seleccionar [A]ccess no "
-"<prgn>dselect</prgn> e depois escolher o método APT. Ser-lhe-à perguntado "
-"por um conjunto de <em>Sources</em> que são os lugares de onde obter os "
-"arquivos. Estes podem ser sites remotos da Internet, mirrors Debian locais "
-"ou CD-ROMs. Cada source pode disponibilizar um fragmento do arquivo Debian "
-"total. O APT irá automaticamente combiná-los para formar um conjunto "
-"completo de pacotes. Se tem um CD-ROM, então é boa ideia especificá-lo em "
-"primeiro lugar e depois especificar um mirror para ter acesso às correcções "
-"de bugs mais recentes. O APT irá automaticamente usar os pacotes no seu CD-"
-"ROM antes de descarregar da Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command> e depois escolher o método APT. Ser-lhe-à "
+"perguntado por um conjunto de <emphasis>Sources</emphasis> que são os "
+"lugares de onde obter os arquivos. Estes podem ser sites remotos da "
+"Internet, mirrors Debian locais ou CD-ROMs. Cada source pode disponibilizar "
+"um fragmento do arquivo Debian total. O APT irá automaticamente combiná-los "
+"para formar um conjunto completo de pacotes. Se tem um CD-ROM, então é boa "
+"ideia especificá-lo em primeiro lugar e depois especificar um mirror para "
+"ter acesso às correcções de bugs mais recentes. O APT irá automaticamente "
+"usar os pacotes no seu CD-ROM antes de descarregar da Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   Configurar uma lista de localizações fonte da distribuição\n"
-"\t \n"
+"\n"
 " Por favor forneça o URL base da distribuição Debian.\n"
 " Os esquemas de acesso que conheço são: http file\n"
-"\t   \n"
+"\n"
 " Por exemplo:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"A configuração de <em>Sources</em> começa por perguntar pela base do arquivo "
-"Debian, usando por predefinição um mirror HTTP. Depois pergunta qual a "
-"distribuição a obter."
+"A configuração de <emphasis>Sources</emphasis> começa por perguntar pela "
+"base do arquivo Debian, usando por predefinição um mirror HTTP. Depois "
+"pergunta qual a distribuição a obter."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Por favor forneça a etiqueta da distribuição a obter ou um caminho para o\n"
 " ficheiro package terminando com um /. As etiquetas da\n"
 " distribuição são tipicamente algo como: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"A distribuição refere-se à versão Debian no arquivo, <em>stable</em> refere-"
-"se à última versão lançada e <em>unstable</em> refere-se à versão de "
-"desenvolvimento. <em>non-US</em> apenas está disponível em alguns mirrors e "
-"refere-se a pacotes que contém tecnologia de encriptação ou outras coisas "
-"que não podem ser exportadas dos Estados Unidos. No entanto importar estes "
-"pacotes para os US é legal."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"A distribuição refere-se à versão Debian no arquivo, <emphasis>stable</"
+"emphasis> refere-se à última versão lançada e <emphasis>unstable</emphasis> "
+"refere-se à versão de desenvolvimento. <emphasis>non-US</emphasis> apenas "
+"está disponível em alguns mirrors e refere-se a pacotes que contém "
+"tecnologia de encriptação ou outras coisas que não podem ser exportadas dos "
+"Estados Unidos. No entanto importar estes pacotes para os US é legal."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Por favor forneça os componentes a obter\n"
 " Tipicamente os componentes são algo como: main contrib non-free\n"
-"  \n"
-" Componentes [main contrib non-free]:"
+"\n"
+" Componentes [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8964,8 +8933,8 @@ msgstr ""
 "pacotes livres DFSG enquanto contrib e non-free contêm coisas que têm várias "
 "restrições colocadas no seu uso e distribuição."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -8973,23 +8942,23 @@ msgstr ""
 "Pode ser adicionado qualquer número de fontes, o script de configuração irá "
 "continuar a perguntar-lhe até que tenha especificado todas as que deseja."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Antes de começar a usar o <prgn>dselect</prgn> é necessário actualizar a "
-"lista disponível ao seleccionar [U]pdate no menu. Isto é um super-conjunto "
-"do <tt>apt-get update</tt> que torna a informação obtida disponível ao "
-"<prgn>dselect</prgn>. Deve ser executado o [U]pdate mesmo que tenha sido "
-"feito <tt>apt-get update</tt> antes."
+"Antes de começar a usar o <command>dselect</command> é necessário actualizar "
+"a lista disponível ao seleccionar [U]pdate no menu. Isto é um super-conjunto "
+"do <literal>apt-get update</literal> que torna a informação obtida "
+"disponível ao <command>dselect</command>. Deve ser executado o [U]pdate "
+"mesmo que tenha sido feito <literal>apt-get update</literal> antes."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9000,76 +8969,83 @@ msgstr ""
 "instalação usando [I]nstall. Quando se usa o método APT os comandos [C]onfig "
 "e [R]emove não fazem sentido, o comando [I]nstall executa ambos juntamente."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Por predefinição o APT irá automaticamente remover o ficheiro de pacote (."
 "deb) assim que ele tenha sido instalado com sucesso. Para alterar este "
-"comportamento coloque <tt>Dselect::clean \"prompt\";</tt> em /etc/apt/apt."
-"conf."
+"comportamento coloque <literal>Dselect::clean \"prompt\";</literal> em /etc/"
+"apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "A Interface"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"O método <command>dselect</command> na verdade é um conjunto de scripts "
+"wrapper para o <command>apt-get</command>. O método disponibiliza mais "
+"funcionalidades que aquelas presentes no <command>apt-get</command> sozinho."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Ambos método <prgn>dselect</prgn> do APT e <prgn>apt-get</prgn> partilham a "
-"mesma interface. É um sistema simples que geralmente lhe diz o que vai fazer "
-"e depois fá-lo. <footnote><p> O método <prgn>dselect</prgn> na verdade é um "
-"conjunto de scripts wrapper para o <prgn>apt-get</prgn>. O método "
-"disponibiliza mais funcionalidades que aquelas presentes no <prgn>apt-get</"
-"prgn> sozinho.</p></footnote> Após escrever um sumário do que vai acontecer, "
-"o APT depois irá escrever algumas mensagens de estado informativo para que "
-"você possa estimar o progresso e quanto falta fazer."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Ambos método <command>dselect</command> do APT e <command>apt-get</command> "
+"partilham a mesma interface. É um sistema simples que geralmente lhe diz o "
+"que vai fazer e depois fá-lo. <placeholder type=\"footnote\" id=\"0\"/> Após "
+"escrever um sumário do que vai acontecer, o APT depois irá escrever algumas "
+"mensagens de estado informativo para que você possa estimar o progresso e "
+"quanto falta fazer."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Arranque"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Antes de todas as operações, excepto a update, o APT executa um número de "
 "acções para preparar o seu estado interno. Também faz algumas verificações "
 "do estado do sistema. A qualquer altura estas operações pode ser executadas "
-"correndo <tt>apt-get check</tt>."
+"correndo <literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9082,21 +9058,21 @@ msgstr ""
 "encontrados serão ignorados e será mostrado um aviso quando o apt-get "
 "terminar."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "A operação final executa uma análise detalhada das dependências do sistema. "
 "Verifica cada dependência de cada pacote instalado ou desempacotado e "
 "considera se está OK. Caso isto encontre um problema, então é escrito um "
-"relatório e o <prgn>apt-get</prgn> recusa-se a funcionar."
+"relatório e o <command>apt-get</command> recusa-se a funcionar."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9106,14 +9082,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
@@ -9122,17 +9098,17 @@ msgstr ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9146,84 +9122,95 @@ msgstr ""
 "não estão satisfeitas. É também incluída uma explicação curta de porquê o "
 "pacote tem um problema de dependência."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"No entanto o APT considera todas as dependências conhecidas e tenta prevenir "
+"pacotes quebrados"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Existem duas maneiras de um sistema entrar num estado de quebra como este. A "
-"primeira é causada pelo <prgn>dpkg</prgn> que não vê algumas relações subtis "
-"entre pacotes quando executa actualizações. <footnote><p>No entanto o APT "
-"considera todas as dependências conhecidas e tenta prevenir pacotes "
-"quebrados</p></footnote>. A segunda é se uma instalação de pacote falha "
+"primeira é causada pelo <command>dpkg</command> que não vê algumas relações "
+"subtis entre pacotes quando executa actualizações. <placeholder type="
+"\"footnote\" id=\"0\"/>. A segunda é se uma instalação de pacote falha "
 "durante uma operação. Nesta situação um pacote pode ter sido desempacotado "
 "sem que as suas dependências tenham sido instaladas."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "A segunda situação é muito menos séria que a primeira porque o APT coloca "
 "certos constrangimentos na ordem que os pacotes são instalados. Em ambos os "
-"casos, fornecer a opção <tt>-f</tt> ao <prgn>apt-get</prgn> irá fazer com "
-"que o APT deduza uma solução possível para o problema e depois continue. O "
-"método <prgn>dselect</prgn> do APT fornece sempre a opção <tt>-f</tt> para "
-"permitir uma continuação fácil de scripts do responsável com falhas."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"No entanto, se for usada a opção <tt>-f</tt> para corrigir um sistema "
-"seriamente quebrado causado pelo primeiro caso, então é possível que ou "
-"falhe imediatamente ou falhe na sequência de instalação. Em qualquer dos "
+"casos, fornecer a opção <literal>-f</literal> ao <command>apt-get</command> "
+"irá fazer com que o APT deduza uma solução possível para o problema e depois "
+"continue. O método <command>dselect</command> do APT fornece sempre a opção "
+"<literal>-f</literal> para permitir uma continuação fácil de scripts do "
+"responsável com falhas."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"No entanto, se for usada a opção <literal>-f</literal> para corrigir um "
+"sistema seriamente quebrado causado pelo primeiro caso, então é possível que "
+"ou falhe imediatamente ou falhe na sequência de instalação. Em qualquer dos "
 "casos é necessário usar o dpkg manualmente (possivelmente com opções de "
 "forçar) para corrigir a situação o suficiente para permitir ao APT continuar."
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "O Relatório de Estado"
 
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-"Antes de prosseguir, o <prgn>apt-get</prgn> irá apresentar um relatório do "
-"que irá acontecer. Geralmente o relatório reflecte o tipo de operações a ser "
-"executadas mas há vários elementos comuns. Em todos os casos a lista "
-"reflecte o estado final das coisas, tendo em conta a opção <tt>-f</tt> e "
-"quaisquer outras actividades relevantes ao comando que vai ser executado."
-
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
+msgid ""
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
+msgstr ""
+"Antes de prosseguir, o <command>apt-get</command> irá apresentar um "
+"relatório do que irá acontecer. Geralmente o relatório reflecte o tipo de "
+"operações a ser executadas mas há vários elementos comuns. Em todos os casos "
+"a lista reflecte o estado final das coisas, tendo em conta a opção <literal>-"
+"f</literal> e quaisquer outras actividades relevantes ao comando que vai ser "
+"executado."
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "A lista de Pacotes Extra"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9231,85 +9218,85 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Os seguinte pacotes extra serão instalados:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "A lista de Pacotes Extra mostra todos os pacotes que irão ser instalados ou "
 "actualizados em excesso daqueles mencionados na linha de comandos. É apenas "
-"gerada para um comando <tt>install</tt>. Os pacotes listados são geralmente "
-"o resultado de uma Auto instalação."
+"gerada para um comando <literal>install</literal>. Os pacotes listados são "
+"geralmente o resultado de uma Auto instalação."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "Os Pacotes para Remover"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Os seguintes pacotes irão ser REMOVIDOS:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "A lista Pacotes para Remover mostra todos os pacotes que irão ser removidos "
 "do sistema. Pode ser mostrada para qualquer das operações e deve ser-lhe "
 "dada uma inspecção cuidadosa para assegurar que nada de importante vai ser "
-"removido. A opção <tt>-f</tt> é especialmente boa a gerar pacotes para "
-"remover, portanto neste caso deve-se usar cuidados extremos. A lista pode "
-"conter pacotes que vão ser removidos porque estão apenas parcialmente "
+"removido. A opção <literal>-f</literal> é especialmente boa a gerar pacotes "
+"para remover, portanto neste caso deve-se usar cuidados extremos. A lista "
+"pode conter pacotes que vão ser removidos porque estão apenas parcialmente "
 "instalados, possivelmente devido a uma instalação abortada."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "A lista de Novos Pacotes"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Os seguintes pacotes NOVOS irão ser instalados:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9319,57 +9306,57 @@ msgstr ""
 "pacotes listados não estão instalados presentemente no sistema mas irão "
 "estar quando o APT terminar."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "A lista Kept Back"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Os seguintes pacotes formam mantidos na versão antiga\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Sempre que todo o sistema é actualizado existe a possibilidade que novas "
 "versões de pacotes não possam ser instaladas porque requerem coisas novas ou "
 "entram em conflito com coisas já instaladas. Nestes casos o pacote irá "
 "aparecer na lista Kept Back. A melhor maneira de convencer os pacotes "
-"listados aqui a instalarem é com o  <tt>apt-get install</tt> ou usando o "
-"<prgn>dselect</prgn> para resolver os seus problemas."
+"listados aqui a instalarem é com o  <literal>apt-get install</literal> ou "
+"usando o <command>dselect</command> para resolver os seus problemas."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "Aviso de Pacotes Mantidos"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Os seguintes pacotes mantidos irão ser alterados:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9379,33 +9366,33 @@ msgstr ""
 "nestes casos ele mostra um aviso que o pacote retido vai ser alterado. Isto "
 "apenas deve acontecer durante um dist-upgrade ou install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Sumário final"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Finalmente, o APT irá escrever um sumário de todas as alterações que irão "
 "acontecer."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 pacotes actualizados, 8 instalados de novo, 23 para remover e 51 não actualizados.\n"
 "12 pacotes não totalmente instalados ou removidos.\n"
-"É necessário obter 65.7M/66.7M de arquivos. Após desempacotamento será usado 26.5M."
+"É necessário obter 65.7M/66.7M de arquivos. Após desempacotamento será usado 26.5M.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9435,8 +9422,8 @@ msgstr ""
 "estar feito. Se forem removidos um grande número de pacotes então o valor "
 "pode indicar a quantidade de espaço que irá ser libertado."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9444,13 +9431,13 @@ msgstr ""
 "Outros relatórios podem ser gerados ao usar a opção -u para mostrar os "
 "pacotes a actualizar, e são semelhantes aos exemplos prévios."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "O Mostrador de Estado"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9458,8 +9445,8 @@ msgstr ""
 "Durante a descarga dos arquivos e ficheiros de pacotes, o APT escreve uma "
 "série de mensagens de estado."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9468,7 +9455,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9476,68 +9463,70 @@ msgstr ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"A linhas iniciadas com <em>Get</em> são escritas quando o APT começa a obter "
-"um ficheiro enquanto a última linha indica o progresso da descarga. O "
-"primeiro valor percentual na linha de progresso indica a percentagem total "
-"completa de todos os ficheiros. Infelizmente como o tamanho dos ficheiros de "
-"Pacotes é desconhecido o <tt>apt-get update</tt> estima a percentagem de "
-"pronto o que causa algumas imprecisões."
+"A linhas iniciadas com <emphasis>Get</emphasis> são escritas quando o APT "
+"começa a obter um ficheiro enquanto a última linha indica o progresso da "
+"descarga. O primeiro valor percentual na linha de progresso indica a "
+"percentagem total completa de todos os ficheiros. Infelizmente como o "
+"tamanho dos ficheiros de Pacotes é desconhecido o <literal>apt-get update</"
+"literal> estima a percentagem de pronto o que causa algumas imprecisões."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "A secção seguinte da linha de estado é repetida para cada processo de "
 "descarga e indica a operação a ser executada e alguma informação útil acerca "
 "do que está a acontecer. Por vezes esta secção irá simplesmente ler "
-"<em>Forking</em> o que representa que o SO está a carregar o módulo de "
-"download. A primeira palavra após o [ é o número de obtenção como mostrado "
-"nas linhas de histórico. A palavra seguinte é o nome em formato curto do "
-"objecto a ser descarregado. Para os arquivos irá conter o nome do pacote que "
-"está a ser descarregado."
+"<emphasis>Forking</emphasis> o que representa que o SO está a carregar o "
+"módulo de download. A primeira palavra após o [ é o número de obtenção como "
+"mostrado nas linhas de histórico. A palavra seguinte é o nome em formato "
+"curto do objecto a ser descarregado. Para os arquivos irá conter o nome do "
+"pacote que está a ser descarregado."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "Dentro da única citação está uma string de informação que indica o progresso "
-"da fase de negociação do download. Progride tipicamente de <em>A Ligar</em> "
-"para <em>À espera do ficheiro</em> para <em>A descarregar</em> ou <em>A "
-"resumir</em>. O valor final é o número de bytes descarregados a partir do "
-"site remoto. Uma vez começado a descarga isto é representado como "
-"<tt>102/10.2k</tt> indicando que 102 bytes foram obtidos e são esperados "
+"da fase de negociação do download. Progride tipicamente de <emphasis>A "
+"Ligar</emphasis> para <emphasis>À espera do ficheiro</emphasis> para "
+"<emphasis>A descarregar</emphasis> ou <emphasis>A resumir</emphasis>. O "
+"valor final é o número de bytes descarregados a partir do site remoto. Uma "
+"vez começado a descarga isto é representado como <literal>102/10.2k</"
+"literal> indicando que 102 bytes foram obtidos e são esperados "
 "10.2kilobytes. O tamanho total é sempre representado numa anotação de 4 "
 "figuras para preservar espaço. Após a amostragem do tamanho está um medidor "
 "de percentagem para o próprio ficheiro. O segundo último elemento é a "
@@ -9547,56 +9536,52 @@ msgstr ""
 "regularmente e reflecte o tempo para completar tudo ao ritmo de "
 "transferência mostrado."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "O mostrador de estado actualiza-se a cada meio segundo para disponibilizar "
 "uma informação de retorno constante do progresso de descarga enquanto as "
 "linhas Get deslocam-se para trás sempre que uma nova linha é iniciada. Como "
 "o mostrador de estado é constantemente actualizado não é apropriado para "
-"registar num ficheiro, use a opção <tt>-q</tt> para remover o mostrador de "
-"estado."
+"registar num ficheiro, use a opção <literal>-q</literal> para remover o "
+"mostrador de estado."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"O APT usa o <prgn>dpkg</prgn> para instalar os arquivos e irá mudar para a "
-"interface do <prgn>dpkg</prgn> assim que a descarga estiver completa. O "
-"<prgn>dpkg</prgn> irá também fazer um número de perguntas conforme vai "
-"processando os pacotes e os próprios pacotes podem também fazer várias "
-"questões. Antes de cada pergunta há geralmente uma descrição do que se está "
-"a perguntar e as perguntas são demasiado variadas para serem discutidas aqui."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"O APT usa o <command>dpkg</command> para instalar os arquivos e irá mudar "
+"para a interface do <command>dpkg</command> assim que a descarga estiver "
+"completa. O <command>dpkg</command> irá também fazer um número de perguntas "
+"conforme vai processando os pacotes e os próprios pacotes podem também fazer "
+"várias questões. Antes de cada pergunta há geralmente uma descrição do que "
+"se está a perguntar e as perguntas são demasiado variadas para serem "
+"discutidas aqui."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "Usando o APT Offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9604,23 +9589,25 @@ msgstr ""
 "Este documento descreve como usar o APT num ambiente sem rede, "
 "especificamente uma aproximação 'sneaker-net' para executar actualizações."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Introdução"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Visão geral"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9632,8 +9619,8 @@ msgstr ""
 "numa ligação lenta, como um modem e outra máquina tem uma ligação muito "
 "rápida mas estão fisicamente distantes."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9641,9 +9628,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "A solução para isto é usar grandes médias amovíveis como um disco Zip ou um "
 "disco SuperDisk. Estes discos não são suficientemente grandes para armazenar "
@@ -9652,12 +9639,12 @@ msgstr ""
 "para gerar uma lista de pacotes que são necessários e depois obter-los para "
 "o disco usando outra máquina com boa ligação. É até possível usar outra "
 "máquina Debian com APT ou usar um SO completamente diferente e uma "
-"ferramenta de download como o wget. Deixe <em>remote host</em> representar a "
-"máquina que descarrega os pacotes, e <em>target host</em> aquela com má ou "
-"nenhuma ligação."
+"ferramenta de download como o wget. Deixe <emphasis>remote host</emphasis> "
+"representar a máquina que descarrega os pacotes, e <emphasis>target host</"
+"emphasis> aquela com má ou nenhuma ligação."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9670,13 +9657,13 @@ msgstr ""
 "sistema de ficheiros que saiba lidar com nomes de ficheiros longos como o "
 "ext2, fat32 ou vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "Usando o APT em ambas máquinas"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9689,8 +9676,8 @@ msgstr ""
 "quais pacotes descarregar. A estrutura de directórios do disco deverá "
 "parecer-se com:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9700,7 +9687,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9709,41 +9696,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "O ficheiro de configuração"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "O ficheiro de configuração deve dizer ao APT para armazenar os seus ficheiro "
 "no disco e usar os ficheiros de configuração do disco também. O sources.list "
 "deve conter os sites apropriados que deseja usar a partir da máquina remota, "
-"e o ficheiro de estado deve ser uma cópia de <em>/var/lib/dpkg/status</em> a "
-"partir do <em>target host</em>. Por favor note, se está a usar um arquivo "
-"local você deve usar copy URIs, a sintaxe é idêntica a file URIs."
+"e o ficheiro de estado deve ser uma cópia de <emphasis>/var/lib/dpkg/status</"
+"emphasis> a partir do <emphasis>target host</emphasis>. Por favor note, se "
+"está a usar um arquivo local você deve usar copy URIs, a sintaxe é idêntica "
+"a file URIs."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> tem de conter a informação necessária para fazer o APT "
-"usar o disco:"
+"<emphasis>apt.conf</emphasis> tem de conter a informação necessária para "
+"fazer o APT usar o disco:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9751,10 +9740,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9765,20 +9754,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Isto não é necessário se as duas máquinas forem da mesma arquitectura, diz\n"
 "      ao APT remoto que arquitectura tem a máquina de destino */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Usa o disco para informação de estado e redirecciona o ficheiro de estado a partir de\n"
@@ -9789,66 +9778,70 @@ msgstr ""
 "   // Caches binárias serão armazenadas localmente\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Localização da lista de fontes.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Mais detalhes podem ser vistos ao examinar o manual do apt.conf e o exemplo "
-"de ficheiro de configuração em <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"de ficheiro de configuração em <emphasis>/usr/share/doc/apt/examples/apt."
+"conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Na máquina de destino a primeira coisa a fazer é montar o disco e copiar "
-"<em>/var/lib/dpkg/status</em> para ele. Você também precisa de criar os "
-"directórios delineados na Visão Geral, <em>archives/partial/</em> e "
-"<em>lists/partial/</em>. Depois leve o disco até à máquina remota e "
-"configure o sources.list. Na máquina remota execute o seguinte:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"<emphasis>/var/lib/dpkg/status</emphasis> para ele. Você também precisa de "
+"criar os directórios delineados na Visão Geral, <emphasis>archives/partial/</"
+"emphasis> e <emphasis>lists/partial/</emphasis>. Depois leve o disco até à "
+"máquina remota e configure o sources.list. Na máquina remota execute o "
+"seguinte:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT obtém os ficheiros de pacotes ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT obtém todos os pacotes necessários para actualizar a máquina de destino ]"
+" [ APT obtém todos os pacotes necessários para actualizar a máquina de destino ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "O comando dist-upgrade pode ser substituído por qualquer outro comando APT "
 "standard, particularmente dselect-upgrade. Você até pode usar um front-end "
-"do APT como o <em>dselect</em>. No entanto isto apresenta um problema ao "
-"comunicar as suas selecções de volta ao computador local."
+"do APT como o <emphasis>dselect</emphasis>. No entanto isto apresenta um "
+"problema ao comunicar as suas selecções de volta ao computador local."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9856,24 +9849,24 @@ msgstr ""
 "Agora o disco contém todos os ficheiros de índice e os arquivos necessários "
 "para actualizar a máquina de destino. Devolva o disco e corra:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT gera uma cópia local dos ficheiros de cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Ou qualquer outro comando APT ]"
+"  [ Ou qualquer outro comando APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9881,8 +9874,8 @@ msgstr ""
 "Para uma função apropriada é necessário re-especificar que o ficheiro de "
 "estado seja o ficheiro local. Isto é muito importante!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9897,24 +9890,25 @@ msgstr ""
 "possível. NÃO copie o ficheiro de estado se entretanto correu o dpkg ou o "
 "APT!!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "Usando APT e wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> é uma ferramenta popular e portável de download que pode "
-"correr praticamente em qualquer máquina. Ao contrário do método acima, este "
-"requer que a máquina Debian já tenha uma lista de pacotes disponíveis."
+"<emphasis>wget</emphasis> é uma ferramenta popular e portável de download "
+"que pode correr praticamente em qualquer máquina. Ao contrário do método "
+"acima, este requer que a máquina Debian já tenha uma lista de pacotes "
+"disponíveis."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9925,13 +9919,13 @@ msgstr ""
 "descarregados do site remoto. Isto é feito ao usar a opção --print-uris no "
 "apt-get e depois preparar um script wget para realmente ir buscar os pacotes."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Operação"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9940,22 +9934,22 @@ msgstr ""
 "configuração especiais. Nós usamos meramente os comandos standard do APT "
 "para gerar a lista de ficheiros."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Escolha não quando perguntado, certifique-se que está contente com as acções ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -9963,8 +9957,8 @@ msgstr ""
 "Qualquer comando além do dist-upgrade pode ser usado aqui, incluindo dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -9976,25 +9970,25 @@ msgstr ""
 "corrido com o directório actual sendo o ponto de montagem do disco para que "
 "grave os resultados no disco."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "A máquina remota deverá fazer algo como"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10002,435 +9996,13 @@ msgstr ""
 "Após os arquivos serem descarregados e o disco retornado à máquina Debian, a "
 "instalação pode prosseguir usando,"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 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"
-
-#~ msgid ""
-#~ "As the configuration can be deferred to be done at the end by &dpkg; it "
-#~ "can be tried to order the unpack series only by critical needs, e.g. by "
-#~ "Pre-Depends. Default is true and therefore the \"old\" method of ordering "
-#~ "in various steps by everything. While both method were present in earlier "
-#~ "APT versions the <literal>OrderCritical</literal> method was unused, so "
-#~ "this method is very experimental and needs further improvements before "
-#~ "becoming really useful."
-#~ msgstr ""
-#~ "Como a configuração pode ser diferida a ser feita no final pelo &dpkg;, "
-#~ "pode ser tentada a ordenar a série de desempacotamento apenas por "
-#~ "necessidades críticas, ex. por pré-dependências. A predefinição é "
-#~ "verdadeiro e então o método \"antigo\" de ordenar em vários passos por "
-#~ "tudo. Enquanto ambos os métodos estão presentes em versões jovens do APT, "
-#~ "o método <literal>OrderCritical</literal> não foi usado, portanto este "
-#~ "método é muito experimental e necessita de mais melhorias antes de se "
-#~ "tornar realmente útil."
-
-#~ msgid "Dump the default configuration to standard error on startup."
-#~ msgstr ""
-#~ "Despeja a configuração predefinida para o erro standard no arranque."
-
-#~ msgid ""
-#~ "Defaults to on which will cause APT to install essential and important "
-#~ "packages as fast as possible in the install/upgrade operation. This is "
-#~ "done to limit the effect of a failing &dpkg; call: If this option is "
-#~ "disabled APT does treat an important package in the same way as an extra "
-#~ "package: Between the unpacking of the important package A and his "
-#~ "configuration can then be many other unpack or configuration calls, e.g. "
-#~ "for package B which has no relation to A, but causes the dpkg call to "
-#~ "fail (e.g. because maintainer script of package B generates an error) "
-#~ "which results in a system state in which package A is unpacked but "
-#~ "unconfigured - each package depending on A is now no longer guaranteed to "
-#~ "work as their dependency on A is not longer satisfied. The immediate "
-#~ "configuration marker is also applied to all dependencies which can "
-#~ "generate a problem if the dependencies e.g. form a circle as a dependency "
-#~ "with the immediate flag is comparable with a Pre-Dependency. So in theory "
-#~ "it is possible that APT encounters a situation in which it is unable to "
-#~ "perform immediate configuration, errors out and refers to this option so "
-#~ "the user can deactivate the immediate configuration temporarily to be "
-#~ "able to perform an install/upgrade again. Note the use of the word "
-#~ "\"theory\" here as this problem was only encountered by now in real world "
-#~ "a few times in non-stable distribution versions and was caused by wrong "
-#~ "dependencies of the package in question or by a system in an already "
-#~ "broken state, so you should not blindly disable this option as the "
-#~ "mentioned scenario above is not the only problem immediate configuration "
-#~ "can help to prevent in the first place.  Before a big operation like "
-#~ "<literal>dist-upgrade</literal> is run with this option disabled it "
-#~ "should be tried to explicitly <literal>install</literal> the package APT "
-#~ "is unable to configure immediately, but please make sure to report your "
-#~ "problem also to your distribution and to the APT team with the buglink "
-#~ "below so they can work on improving or correcting the upgrade process."
-#~ msgstr ""
-#~ "A predefinição é ligado o que irá fazer com que o APT instale pacotes "
-#~ "essenciais e importantes o mais rápido possível na operação de instalar/"
-#~ "actualizar. Isto é feito para limitar o efeito de uma chamada falhada do "
-#~ "&dpkg;. Se esta opção for desactivada, o APT trata um pacote importante "
-#~ "do mesmo modo que um pacote extra: Entre o desempacotamento do pacote "
-#~ "importante A e a sua configuração podem acontecer muitas outras chamadas "
-#~ "de desempacotamento e configuração, exemplo, para o pacote B que não tem "
-#~ "nenhuma relação com A, mas causa uma falha na chamada ao dpkg (ex, porque "
-#~ "o script do responsável do pacote B gera um erro) o qual resulta num "
-#~ "estado do sistema em que o pacote A está desempacotado mas ainda não "
-#~ "configurado - já não se garante o funcionamento de cada pacote que "
-#~ "depende de A porque a sua dependência já não está satisfeita. O marcador "
-#~ "de configuração imediata é também aplicado a todas as dependências que "
-#~ "possam gerar um problema se as dependências, ex, formam um círculo como "
-#~ "uma dependência com a marca de imediato a ser comparável com uma Pré-"
-#~ "Dependência. Portanto, em teoria, é possível que o APT encontre uma "
-#~ "situação na qual é incapaz de executar configuração imediata, entre em "
-#~ "erro e refira esta opção para que o utilizador possa desactivar "
-#~ "temporariamente a configuração imediata para ser capaz de executar uma "
-#~ "instalação/actualização outra vez. Note o uso da palavra \"teoria\" aqui "
-#~ "pois este problema foi poucas vezes encontrado até agora no mundo real em "
-#~ "versões de distribuição não-estáveis e causados por dependências erradas "
-#~ "do pacote em questão ou por um sistema já num estado corrompido, portanto "
-#~ "você não deve desactivar esta opção às cegas porque, em primeiro lugar, o "
-#~ "cenário mencionado acima não é o único problema que a configuração "
-#~ "imediata pode ajudar a prevenir. Antes de uma grande operação como "
-#~ "<literal>dist-upgrade</literal> ser corrida com esta opção desactivada, "
-#~ "deve ser tentado primeiro fazer um <literal>install</literal> explicito "
-#~ "ao pacote que o APT é incapaz de configurar imediatamente, mas por favor "
-#~ "certifique-se de também relatar o seu problema à sua distribuição e à "
-#~ "equipa do APT com o link de bug abaixo para que possam trabalhar na "
-#~ "melhoria ou correcção do processo de actualização."
-
-#~ msgid ""
-#~ "The package resource list is used to locate archives of the package "
-#~ "distribution system in use on the system. At this time, this manual page "
-#~ "documents only the packaging system used by the Debian system.  This "
-#~ "control file is <filename>/etc/apt/sources.list</filename>."
-#~ msgstr ""
-#~ "A lista de recursos de pacote é usada para localizar arquivos do sistema "
-#~ "de distribuição de pacotes usado no sistema. Neste momento, este manual "
-#~ "documenta apenas o sistema de pacotes usado pelo sistema Debian. Este "
-#~ "ficheiro de controle é <filename>/etc/apt/sources.list</filename>."
-
-#~ msgid ""
-#~ "The source list is designed to support any number of active sources and a "
-#~ "variety of source media. The file lists one source per line, with the "
-#~ "most preferred source listed first. The format of each line is: "
-#~ "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#~ "determines the format for <literal>args</literal>. <literal>uri</literal> "
-#~ "is a Universal Resource Identifier (URI), which is a superset of the more "
-#~ "specific and well-known Universal Resource Locator, or URL. The rest of "
-#~ "the line can be marked as a comment by using a #."
-#~ msgstr ""
-#~ "A lista de fontes é desenhada para suportar qualquer número de fontes "
-#~ "activas e uma variedade de médias fonte. O ficheiro lista uma fonte por "
-#~ "linha, com a fonte mais preferida listada em primeiro lugar. O formato "
-#~ "para cada linha é: <literal>tipo uri argumentos</literal>. O primeiro "
-#~ "item, <literal>tipo</literal> determina o formato para "
-#~ "<literal>argumentos</literal>. <literal>uri</literal> é um Universal "
-#~ "Resource Identifier (URI), o que é um super-conjunto para o mais "
-#~ "específico e conhecido Universal Resource Locator, ou URL. O resto da "
-#~ "linha pode ser marcado como um comentário usando um #."
-
-#~ msgid ""
-#~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
-#~ "get check</command>. It builds the source and package caches from the "
-#~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
-#~ "filename>."
-#~ msgstr ""
-#~ "<literal>gencaches</literal> executa a mesma operação que o <command>apt-"
-#~ "get check</command>. Constrói as caches de fonte e pacote a partir das "
-#~ "fontes em &sources-list; e a partir de <filename>/var/lib/dpkg/status</"
-#~ "filename>."
-
-#~ msgid ""
-#~ "One setting is provided to control the pipeline depth in cases where the "
-#~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
-#~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#~ "5 indicating how many outstanding requests APT should send. A value of "
-#~ "zero MUST be specified if the remote host does not properly linger on TCP "
-#~ "connections - otherwise data corruption will occur. Hosts which require "
-#~ "this are in violation of RFC 2068."
-#~ msgstr ""
-#~ "É disponibilizada uma definição para controlar a profundidade do pipeline "
-#~ "em casos onde o servidor remoto não é compatível com RFC ou é buggy (como "
-#~ "o Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> pode ser "
-#~ "um valor de 0 a 5 que indica quantos requerimentos pendentes o APT deve "
-#~ "enviar. TEM de ser especificado um valor de 0 se a máquina remota não "
-#~ "hesitar propriamente em ligações TCP - de outro modo irá ocorrer "
-#~ "corrupção de dados. As máquinas que requerem isto estão em violação de "
-#~ "RFC 2068."
-
-#~ msgid "add <replaceable>filename</replaceable>"
-#~ msgstr "add <replaceable>nome-de-ficheiro</replaceable>"
-
-#~ msgid "del <replaceable>keyid</replaceable>"
-#~ msgstr "del <replaceable>id de chave</replaceable>"
-
-#~ msgid "export <replaceable>keyid</replaceable>"
-#~ msgstr "export <replaceable>id de chave</replaceable>"
-
-#~ msgid ""
-#~ "Update the local keyring with the keyring of Debian archive keys and "
-#~ "removes from the keyring the archive keys which are no longer valid."
-#~ msgstr ""
-#~ "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
-#~ "remove do chaveiro as chaves de arquivo que já não são válidas."
-
-#~ msgid "--keyring <replaceable>filename</replaceable>"
-#~ msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
-
-#, fuzzy
-#~| msgid ""
-#~| "Seconds the Release file should be considered valid after it was "
-#~| "created. The default is \"for ever\" (0) if the Release file of the "
-#~| "archive doesn't include a <literal>Valid-Until</literal> header.  If it "
-#~| "does then this date is the default. The date from the Release file or "
-#~| "the date specified by the creation time of the Release file "
-#~| "(<literal>Date</literal> header) plus the seconds specified with this "
-#~| "options are used to check if the validation of a file has expired by "
-#~| "using the earlier date of the two. Archive specific settings can be made "
-#~| "by appending the label of the archive to the option name."
-#~ msgid ""
-#~ "Seconds the Release file should be considered valid after it was created. "
-#~ "The default is \"for ever\" (0) if the Release file of the archive "
-#~ "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
-#~ "this date is the default. The date from the Release file or the date "
-#~ "specified by the creation time of the Release file (<literal>Date</"
-#~ "literal> header) plus the seconds specified with this options are used to "
-#~ "check if the validation of a file has expired by using the earlier date "
-#~ "of the two. Archive specific settings can be made by appending the label "
-#~ "of the archive to the option name."
-#~ msgstr ""
-#~ "Segundos em que o ficheiro Release deve considerado válido após ser "
-#~ "criado. A predefinição é \"para sempre\" (0) se o ficheiro Release do "
-#~ "arquivo não conter um cabeçalho <literal>Valid-Until</literal>. Se o "
-#~ "tiver então esta data é a predefinida. A data do ficheiro Release ou a "
-#~ "data especificada pela hora de criação do do ficheiro Release (cabeçalho "
-#~ "<literal>Date</literal>) mais os segundos especificados com esta opção "
-#~ "são usados para verificar se a validação de um ficheiro já expirou ao "
-#~ "usar uma data anterior às duas. Definições específicas do Arquivo podem "
-#~ "ser feitas ao adicionar a etiqueta do arquivo ao nome da opção. "
-
-#~ msgid ""
-#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
-#~ "index files will not have MD5Sum fields where possible.  Configuration "
-#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
-#~ msgstr ""
-#~ "Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros "
-#~ "índice gerados não terão campos MD5Sum onde possíveis. Item de "
-#~ "Configuração: <literal>APT::FTPArchive::MD5</literal>"
-
-#~ msgid "Show a short usage summary."
-#~ msgstr "Mostra um curto sumário de utilização."
-
-#~ msgid "Show the program version."
-#~ msgstr "Mostra a versão do programa."
-
-#~ msgid "to the version that is already installed (if any)."
-#~ msgstr "para a versão que já está instalada (se alguma)."
-
-#~ msgid "APT package handling utility -- cache manipulator"
-#~ msgstr ""
-#~ "Utilitário de manuseamento de pacotes do APT -- manipulador de cache"
-
-#~ msgid "add <replaceable>file(s)</replaceable>"
-#~ msgstr "add <replaceable>ficheiro(s)</replaceable>"
-
-#~ msgid ""
-#~ "<literal>add</literal> adds the named package index files to the package "
-#~ "cache.  This is for debugging only."
-#~ msgstr ""
-#~ "<literal>add</literal> adiciona ficheiros índice do pacote nomeado à "
-#~ "cache pacotes. Isto é apenas para depuração."
-
-#~ msgid ""
-#~ "The <literal>release</literal> command generates a Release file from a "
-#~ "directory tree. It recursively searches the given directory for Packages, "
-#~ "Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and "
-#~ "md5sum.txt files.  It then writes to stdout a Release file containing an "
-#~ "MD5 digest and SHA1 digest for each file."
-#~ msgstr ""
-#~ "O comando <literal>release</literal> gera um ficheiro Release a partir "
-#~ "duma árvore de directórios. Procura recursivamente o directório dado por "
-#~ "ficheiros Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, "
-#~ "Sources.bz2, Release e md5sum.txt. Depois escreve para o stdout um "
-#~ "ficheiro Release contendo um sumário MD5 e um sumário SHA1 por cada "
-#~ "ficheiro."
-
-#~ msgid "Also install recommended packages."
-#~ msgstr "Também instala pacotes recomendados."
-
-#~ msgid "Do not install recommended packages."
-#~ msgstr "Não instala pacotes recomendados."
-
-#~ msgid ""
-#~ "While it is possible to add an empty compression type to the order list, "
-#~ "but APT in its current version doesn't understand it correctly and will "
-#~ "display many warnings about not downloaded files - these warnings are "
-#~ "most of the time false negatives. Future versions will maybe include a "
-#~ "way to really prefer uncompressed files to support the usage of local "
-#~ "mirrors."
-#~ msgstr ""
-#~ "Apesar de ser possível de adicionar um tipo de compressão vazio à lista "
-#~ "de ordem, o APT na sua versão actual não o compreende correctamente e irá "
-#~ "mostrar muitos avisos acerca de ficheiros não descarregados - estes "
-#~ "avisos são na maioria vezes falsos positivos. Futuras versões irão talvez "
-#~ "incluir um modo de realmente preferir ficheiros não-comprimidos para "
-#~ "suportar a utilização de mirrors locais."
-
-#~ msgid ""
-#~ "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
-#~ "US directory."
-#~ msgstr ""
-#~ "Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório "
-#~ "debian-non-US."
-
-#~ msgid "OPTIONS"
-#~ msgstr "OPÇÕES"
-
-#~ msgid "None."
-#~ msgstr "Nenhum."
-
-#~ msgid "FILES"
-#~ msgstr "FICHEIROS"
-
-#~ msgid ""
-#~ "Status list of auto-installed packages.  Configuration Item: "
-#~ "<literal>Dir::State</literal> sets the path to the "
-#~ "<filename>extended_states</filename> file."
-#~ msgstr ""
-#~ "Lista de estado de pacotes auto-instalados. Item de Configuração: "
-#~ "<literal>Dir::State</literal> que define o caminho para o ficheiro "
-#~ "<filename>extended_states</filename>."
-
-#~ msgid ""
-#~ "APT uses a fixed size memory mapped cache file to store the 'available' "
-#~ "information. This sets the size of that cache (in bytes)."
-#~ msgstr ""
-#~ "O APT usa um ficheiro de cache de memória mapeada de tamanho fixo para "
-#~ "armazenar a informação 'disponível'. Isto define o tamanho dessa cache "
-#~ "(em bytes)."
-
-#~ msgid ""
-#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
-#~ "is optional.  If omitted, APT assigns a priority of 1 less than the last "
-#~ "value specified on a line beginning with <literal>Pin-Priority: "
-#~ "release ...</literal>."
-#~ msgstr ""
-#~ "A linha <literal>Pin-Priority:</literal> em cada registo de preferências "
-#~ "do APT é opcional. Se omitida, o APT atribui uma prioridade de 1 a menos "
-#~ "do último valor especificado numa linha que começa com <literal>Pin-"
-#~ "Priority: release ...</literal>."
-
-#~ msgid "Keyring of local trusted keys, new keys will be added here."
-#~ msgstr ""
-#~ "Chaveiro das chaves de confiança locais, as novas chaves serão "
-#~ "adicionadas aqui."
-
-#~ msgid ""
-#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
-#~ "suite of tools, all tools make use of the configuration file and a common "
-#~ "command line parser to provide a uniform environment. When an APT tool "
-#~ "starts up it will read the configuration specified by the "
-#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
-#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
-#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
-#~ "finally apply the command line options to override the configuration "
-#~ "directives, possibly loading even more config files."
-#~ msgstr ""
-#~ "<filename>apt.conf</filename> é o ficheiro de configuração principal para "
-#~ "a suite de ferramentas do APT, todas as ferramentas usam o ficheiro de "
-#~ "configuração e um analisador de linha de comandos comum para "
-#~ "disponibilizar um ambiente uniforme. Quando uma ferramenta do APT arranca "
-#~ "lê a configuração especificada pela variável de ambiente "
-#~ "<envar>APT_CONFIG</envar> (se existir alguma) e depois lê os ficheiros em "
-#~ "<literal>Dir::Etc::Parts</literal>, depois lê o ficheiro de configuração "
-#~ "principal especificado por <literal>Dir::Etc::main</literal> e finalmente "
-#~ "aplica as opções de linha de comandos para sobrepor as directivas de "
-#~ "configuração, possivelmente carregando ainda mais ficheiros de "
-#~ "configuração."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 3813a7ed8..d28c1e633 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -5,16 +5,15 @@
 # Translators:
 # André Luís Lopes <andrelop@ig.com.br>
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\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"
-"Language: \n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -480,38 +479,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: 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
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: 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
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 #, fuzzy
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -520,7 +519,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -529,28 +528,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 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
+#: apt.8.xml:60
 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
+#: apt.8.xml:67
 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
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -561,7 +560,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -571,30 +570,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 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
+#: apt.8.xml:95
 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
+#: apt.8.xml:101
 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."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 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 "
@@ -602,19 +601,19 @@ msgid ""
 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
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 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 "
@@ -624,12 +623,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 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 "
@@ -637,26 +636,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 #, 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
+#: apt.8.xml:151
 #, 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
+#: apt.8.xml:155
 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
+#: apt.8.xml:160
 #, fuzzy
 msgid ""
 "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
@@ -664,43 +663,43 @@ msgid ""
 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
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 #, fuzzy
 msgid "See Also"
 msgstr "Consulte também"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 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
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 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
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt-get.8.xml:35
 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 "
@@ -709,15 +708,15 @@ msgid ""
 msgstr ""
 
 #. 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
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -731,7 +730,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -746,7 +745,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -761,7 +760,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -772,7 +771,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -789,14 +788,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -808,14 +807,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -827,7 +826,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -835,7 +834,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -847,7 +846,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -857,7 +856,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -867,7 +866,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -877,7 +876,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -885,7 +884,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -895,21 +894,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -918,7 +917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -930,7 +929,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -938,7 +937,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -952,28 +951,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 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 "
@@ -989,7 +988,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1001,7 +1000,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1009,7 +1008,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1021,7 +1020,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1029,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1041,7 +1040,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1051,7 +1050,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1061,28 +1060,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1093,7 +1092,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 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 "
@@ -1103,14 +1102,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 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:396
+#: apt-get.8.xml:390
 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 "
@@ -1119,7 +1118,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1131,7 +1130,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1140,7 +1139,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1149,7 +1148,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1159,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1172,7 +1171,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 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. "
@@ -1181,14 +1180,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 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:462
+#: apt-get.8.xml:456
 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 "
@@ -1199,7 +1198,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1213,7 +1212,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1222,14 +1221,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 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:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1238,7 +1237,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 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 "
@@ -1250,7 +1249,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 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</"
@@ -1258,14 +1257,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 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:529
+#: apt-get.8.xml:523
 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::"
@@ -1273,7 +1272,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1283,13 +1282,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1297,19 +1296,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1318,21 +1317,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1346,7 +1345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1362,7 +1361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -1374,21 +1373,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1397,7 +1396,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -1408,7 +1407,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -1417,7 +1416,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1426,7 +1425,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1436,7 +1435,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -1446,14 +1445,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1461,40 +1460,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -1507,28 +1506,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 #, fuzzy
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr ""
@@ -1536,7 +1535,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1546,7 +1545,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1554,7 +1553,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1567,7 +1566,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -1576,19 +1575,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 #, fuzzy
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr ""
@@ -1596,7 +1595,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1605,7 +1604,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1617,7 +1616,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -1625,7 +1624,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1635,7 +1634,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1644,7 +1643,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -1652,7 +1651,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -1662,14 +1661,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1680,7 +1679,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1688,14 +1687,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1703,7 +1702,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1711,7 +1710,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1719,24 +1718,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -1744,12 +1743,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -1757,39 +1756,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -1798,7 +1797,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -1809,19 +1808,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -1832,56 +1831,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 #, fuzzy
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt.conf</>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 #, fuzzy
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -1891,7 +1890,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -1899,7 +1898,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -1907,7 +1906,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -1917,14 +1916,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -1933,7 +1932,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -1941,14 +1940,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -1957,19 +1956,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -1978,7 +1977,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 msgid ""
 "If a package comes from a archive without a signature, or with a signature "
 "that apt does not have a key for, that package is considered untrusted, and "
@@ -1988,19 +1987,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2011,7 +2010,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2020,7 +2019,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. In order to become "
@@ -2031,7 +2030,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2044,7 +2043,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2052,14 +2051,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2069,7 +2068,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2078,7 +2077,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2087,12 +2086,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys, although an installation of "
@@ -2101,7 +2100,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2112,19 +2111,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2132,7 +2131,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2140,7 +2139,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2148,7 +2147,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -2156,14 +2155,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2174,24 +2173,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -2200,7 +2199,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -2208,7 +2207,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -2218,7 +2217,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -2226,14 +2225,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
@@ -2241,7 +2240,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 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.  "
@@ -2249,7 +2248,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2257,7 +2256,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -2265,7 +2264,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2274,7 +2273,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2282,7 +2281,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -2290,25 +2289,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 #, fuzzy
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -2317,7 +2316,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -2327,7 +2326,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -2336,14 +2335,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -2351,24 +2350,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -2379,8 +2378,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 #, fuzzy
 msgid "&apt-conf;"
 msgstr ""
@@ -2389,34 +2388,34 @@ msgstr ""
 " "
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -2425,21 +2424,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -2451,25 +2450,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -2479,7 +2478,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -2494,7 +2493,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -2506,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -2514,27 +2513,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -2544,7 +2543,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -2556,7 +2555,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -2566,7 +2565,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -2578,7 +2577,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -2595,19 +2594,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -2615,7 +2614,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -2628,7 +2627,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -2637,7 +2636,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -2646,14 +2645,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 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:201
+#: apt.conf.5.xml:195
 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 "
@@ -2662,7 +2661,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 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 "
@@ -2677,7 +2676,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -2694,7 +2693,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 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 "
@@ -2705,7 +2704,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 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 "
@@ -2718,7 +2717,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 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 "
@@ -2738,38 +2737,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 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:282
+#: apt.conf.5.xml:276
 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:287
+#: apt.conf.5.xml:281
 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:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -2777,7 +2776,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -2790,7 +2789,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2802,7 +2801,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2814,7 +2813,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2822,7 +2821,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 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 "
@@ -2833,7 +2832,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -2843,21 +2842,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 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:364
+#: apt.conf.5.xml:358
 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:369
+#: apt.conf.5.xml:363
 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]/</"
@@ -2869,7 +2868,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 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 "
@@ -2881,14 +2880,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 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:390
+#: apt.conf.5.xml:384
 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."
@@ -2900,14 +2899,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 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:400
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -2917,7 +2916,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -2925,7 +2924,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 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 "
@@ -2939,7 +2938,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2950,7 +2949,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2972,7 +2971,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 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]/</"
@@ -2991,7 +2990,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -3001,7 +3000,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 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 "
@@ -3010,7 +3009,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3020,13 +3019,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3039,20 +3038,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 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:523
+#: apt.conf.5.xml:517
 #, 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:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -3064,19 +3063,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -3094,13 +3093,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -3115,7 +3114,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -3123,7 +3122,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -3132,7 +3131,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -3144,13 +3143,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -3172,7 +3171,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -3181,22 +3180,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -3208,20 +3207,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3231,7 +3231,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -3239,7 +3239,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -3250,7 +3250,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3263,7 +3263,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -3274,12 +3274,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3287,7 +3287,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -3300,40 +3300,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 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:682
+#: 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 update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 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:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 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:699
+#: apt.conf.5.xml:694
 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 "
@@ -3341,7 +3341,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -3350,7 +3350,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 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 "
@@ -3361,7 +3361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3370,7 +3370,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3381,7 +3381,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -3392,26 +3392,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 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:746
+#: apt.conf.5.xml:741
 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:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 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 "
@@ -3426,7 +3426,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3436,7 +3436,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -3450,7 +3450,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -3463,7 +3463,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -3480,7 +3480,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -3491,7 +3491,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -3501,7 +3501,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3513,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 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 "
@@ -3527,12 +3527,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -3541,12 +3541,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3557,7 +3557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -3565,7 +3565,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -3573,7 +3573,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3583,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:877
+#: apt.conf.5.xml:872
 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:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 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:951
+#: apt.conf.5.xml:946
 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:961
+#: apt.conf.5.xml:956
 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:971
+#: apt.conf.5.xml:966
 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:981
+#: apt.conf.5.xml:976
 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 "
@@ -3650,53 +3650,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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:1004
+#: apt.conf.5.xml:999
 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:1014
+#: apt.conf.5.xml:1009
 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:1024
+#: apt.conf.5.xml:1019
 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:1036
+#: apt.conf.5.xml:1031
 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:1047
+#: apt.conf.5.xml:1042
 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:1058
+#: apt.conf.5.xml:1053
 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:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -3706,7 +3706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -3724,46 +3724,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 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:1114
+#: apt.conf.5.xml:1109
 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:1125
+#: apt.conf.5.xml:1120
 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:1137
+#: apt.conf.5.xml:1132
 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:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 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:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -3771,14 +3771,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 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
+#: apt.conf.5.xml:1186
 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 "
@@ -3786,14 +3786,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3801,19 +3801,19 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 #, fuzzy
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 #, fuzzy
 msgid "Preference control file for APT"
 msgstr "Arquivo de controle de preferências para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 #, fuzzy
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
@@ -3826,7 +3826,7 @@ msgstr ""
 "para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 #, fuzzy
 msgid ""
 "Several versions of a package may be available for installation when the "
@@ -3849,7 +3849,7 @@ msgstr ""
 "selecionada para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 #, fuzzy
 msgid ""
 "Several instances of the same version of a package may be available when the "
@@ -3865,7 +3865,7 @@ msgstr ""
 "a escolha da instância."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -3879,7 +3879,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -3892,13 +3892,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 #, fuzzy
 msgid "APT's Default Priority Assignments"
 msgstr "Atribuições de Prioridade Padrão do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, fuzzy, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr ""
@@ -3906,7 +3906,7 @@ msgstr ""
 "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, fuzzy, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr ""
@@ -3914,7 +3914,7 @@ msgstr ""
 "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 #, fuzzy
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
@@ -3939,7 +3939,7 @@ msgstr ""
 "etc/apt/apt.conf</filename>. Por exemplo,"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 #, fuzzy
 msgid ""
 "If the target release has been specified then APT uses the following "
@@ -3950,13 +3950,13 @@ msgstr ""
 "Atribuirá :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 #, fuzzy
 msgid "priority 1"
 msgstr "prioridade 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -3965,13 +3965,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 #, fuzzy
 msgid "priority 100"
 msgstr "prioridade 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -3980,13 +3980,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 #, fuzzy
 msgid "priority 500"
 msgstr "prioridade 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 #, fuzzy
 msgid ""
 "to the versions that are not installed and do not belong to the target "
@@ -3995,13 +3995,13 @@ msgstr ""
 "para as instâncias que não estã instaladas e que não pertencem a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 #, fuzzy
 msgid "priority 990"
 msgstr "prioridade 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 #, fuzzy
 msgid ""
 "to the versions that are not installed and belong to the target release."
@@ -4009,7 +4009,7 @@ msgstr ""
 "para as instâncias que não estejam instaladas e pertençam a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 #, fuzzy
 msgid ""
 "If the target release has not been specified then APT simply assigns "
@@ -4024,7 +4024,7 @@ msgstr ""
 "prioridade 500 para todas as instâncias de pacotes não instaladas."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 #, fuzzy
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
@@ -4034,7 +4034,7 @@ msgstr ""
 "determinar qual instância de um pacote instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 #, fuzzy
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
@@ -4051,13 +4051,13 @@ msgstr ""
 "\"downgrade\" pode ser arriscado.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 #, fuzzy
 msgid "Install the highest priority version."
 msgstr "Instala a instância de prioridade mais alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 #, fuzzy
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
@@ -4067,7 +4067,7 @@ msgstr ""
 "mais recente (ou seja, aquela com o maior número de versão)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 #, fuzzy
 msgid ""
 "If two or more versions have the same priority and version number but either "
@@ -4079,7 +4079,7 @@ msgstr ""
 "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 #, fuzzy
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
@@ -4096,7 +4096,7 @@ msgstr ""
 "forem executados."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 #, fuzzy
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -4111,7 +4111,7 @@ msgstr ""
 "upgrade</command> forem executados."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 #, fuzzy
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
@@ -4131,13 +4131,13 @@ msgstr ""
 "disponíveis possuir uma prioridade maior do que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 #, fuzzy
 msgid "The Effect of APT Preferences"
 msgstr "O Efeito das Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 #, fuzzy
 msgid ""
 "The APT preferences file allows the system administrator to control the "
@@ -4151,7 +4151,7 @@ msgstr ""
 "das duas formas, uma forma específica e uma forma geral."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 #, fuzzy
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -4168,7 +4168,7 @@ msgstr ""
 "com \"<literal>5.8</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
@@ -4181,7 +4181,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 #, fuzzy
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
@@ -4197,7 +4197,7 @@ msgstr ""
 "identificado pelo nome de domínio totalmente qualificado do site Internet."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 #, fuzzy
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
@@ -4210,7 +4210,7 @@ msgstr ""
 "no site local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4223,7 +4223,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -4232,7 +4232,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4245,7 +4245,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 #, fuzzy
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
@@ -4262,7 +4262,7 @@ msgstr ""
 "como \"Debian\" ou \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 #, fuzzy
 msgid ""
 "The following record assigns a low priority to all package versions "
@@ -4274,7 +4274,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4287,7 +4287,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 #, fuzzy
 msgid ""
 "The following record assigns a high priority to all package versions "
@@ -4299,7 +4299,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4312,7 +4312,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 #, fuzzy
 msgid ""
 "The following record assigns a high priority to all package versions "
@@ -4325,7 +4325,7 @@ msgstr ""
 "literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4338,12 +4338,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -4353,7 +4353,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, fuzzy, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -4366,7 +4366,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -4374,7 +4374,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4387,7 +4387,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -4398,13 +4398,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 #, fuzzy
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 #, fuzzy
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
@@ -4415,12 +4415,12 @@ msgstr ""
 "seguir (a grosso modo):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 #, fuzzy
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
@@ -4430,12 +4430,12 @@ msgstr ""
 "dowgrade do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 #, fuzzy
 msgid ""
 "causes a version to be installed even if it does not come from the target "
@@ -4445,12 +4445,12 @@ msgstr ""
 "versão alvo, a menos que a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -4460,12 +4460,12 @@ msgstr ""
 "disponível pertencente a versão alvo ou a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -4476,12 +4476,12 @@ msgstr ""
 "seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 #, fuzzy
 msgid ""
 "causes a version to be installed only if there is no installed version of "
@@ -4491,18 +4491,18 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 #, fuzzy
 msgid "prevents the version from being installed"
 msgstr "impede a versão de ser instalada"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 #, fuzzy
 msgid ""
 "If any specific-form records match an available package version then the "
@@ -4518,7 +4518,7 @@ msgstr ""
 "determinará a prioridade da versão do pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 #, fuzzy
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
@@ -4528,7 +4528,7 @@ msgstr ""
 "registros apresentados anteriormente :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
@@ -4557,12 +4557,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 #, fuzzy
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
@@ -4578,7 +4578,7 @@ msgstr ""
 "será feito um downgrade do <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 #, fuzzy
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
@@ -4590,7 +4590,7 @@ msgstr ""
 "mesmo versões pertencentes a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 #, fuzzy
 msgid ""
 "A version of a package whose origin is not the local system but some other "
@@ -4605,13 +4605,13 @@ msgstr ""
 "instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 #, fuzzy
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 #, fuzzy
 msgid ""
 "The locations listed in the &sources-list; file should provide "
@@ -4623,7 +4623,7 @@ msgstr ""
 "os pacotes disponíveis nessas localidades."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 #, fuzzy
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
@@ -4644,31 +4644,31 @@ msgstr ""
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 #, fuzzy
 msgid "the <literal>Package:</literal> line"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 #, fuzzy
 msgid "gives the package name"
 msgstr "informa o nome do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 #, fuzzy
 msgid "the <literal>Version:</literal> line"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 #, fuzzy
 msgid "gives the version number for the named package"
 msgstr "informa o número de versão do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 #, fuzzy
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
@@ -4691,13 +4691,13 @@ msgstr ""
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 #, fuzzy
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 #, fuzzy
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
@@ -4715,7 +4715,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, fuzzy, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
@@ -4723,13 +4723,13 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 #, fuzzy
 msgid "the <literal>Codename:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
@@ -4747,7 +4747,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, fuzzy, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
@@ -4755,7 +4755,7 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 #, fuzzy
 msgid ""
 "names the release version.  For example, the packages in the tree might "
@@ -4773,7 +4773,7 @@ msgstr ""
 "linhas a seguir."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, fuzzy, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -4786,13 +4786,13 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 #, fuzzy
 msgid "the <literal>Component:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 #, fuzzy
 msgid ""
 "names the licensing component associated with the packages in the directory "
@@ -4811,7 +4811,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, fuzzy, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
@@ -4819,13 +4819,13 @@ msgstr ""
 "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 #, fuzzy
 msgid "the <literal>Origin:</literal> line"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 #, fuzzy
 msgid ""
 "names the originator of the packages in the directory tree of the "
@@ -4839,7 +4839,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, fuzzy, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
@@ -4847,13 +4847,13 @@ msgstr ""
 "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 #, fuzzy
 msgid "the <literal>Label:</literal> line"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 #, fuzzy
 msgid ""
 "names the label of the packages in the directory tree of the "
@@ -4866,7 +4866,7 @@ msgstr ""
 "arquivo de preferências do APT iria requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, fuzzy, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
@@ -4874,7 +4874,7 @@ msgstr ""
 "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 #, fuzzy
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -4900,13 +4900,13 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 #, fuzzy
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Linhas Opcionais em um Registro de Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 #, fuzzy
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
@@ -4918,13 +4918,13 @@ msgstr ""
 "</literal>. Isto oferece um local para inserir comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 #, fuzzy
 msgid "Tracking Stable"
 msgstr "Acompanhando a Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -4949,7 +4949,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
@@ -4965,8 +4965,8 @@ msgstr ""
 "outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, fuzzy, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -4979,7 +4979,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -4992,7 +4992,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
@@ -5000,7 +5000,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -5013,13 +5013,13 @@ msgstr ""
 "atualizado novamente a menos que esse comando seja executado novamente."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 #, fuzzy
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando a Testing"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -5048,7 +5048,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
@@ -5065,7 +5065,7 @@ msgstr ""
 "versões de pacotes de outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -5078,7 +5078,7 @@ msgstr ""
 "a(s) última(s) versão(ões) <literal>testing</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
@@ -5086,7 +5086,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -5106,12 +5106,12 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -5141,7 +5141,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -5156,7 +5156,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -5169,7 +5169,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
@@ -5177,7 +5177,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -5197,18 +5197,18 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 #, fuzzy
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -5219,7 +5219,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -5229,12 +5229,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -5247,12 +5247,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -5267,20 +5267,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -5303,14 +5303,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 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.  "
@@ -5323,7 +5323,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -5335,7 +5335,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 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 "
@@ -5351,7 +5351,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -5362,7 +5362,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -5372,7 +5372,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
@@ -5381,7 +5381,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -5392,7 +5392,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -5401,13 +5401,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 #, fuzzy
 msgid "Some examples:"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -5416,17 +5416,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -5434,14 +5434,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -5452,7 +5452,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -5465,7 +5465,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -5474,7 +5474,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5483,12 +5483,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -5500,42 +5500,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5543,7 +5543,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -5551,33 +5551,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -5586,19 +5586,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -5610,25 +5610,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 #, fuzzy
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -5638,12 +5638,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -5653,7 +5653,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -5661,19 +5661,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -5682,32 +5682,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -5716,7 +5716,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -5726,7 +5726,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -5736,7 +5736,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -5745,13 +5745,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -5760,7 +5760,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -5768,7 +5768,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -5779,7 +5779,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -5794,7 +5794,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -5807,7 +5807,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -5817,19 +5817,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -5840,19 +5840,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 #, fuzzy
 msgid "<literal>Dir</literal> Section"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -5861,7 +5861,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -5869,30 +5869,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 #, fuzzy
 msgid "<literal>Default</literal> Section"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -5900,7 +5900,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -5909,42 +5909,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -5952,14 +5952,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -5967,13 +5967,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 #, fuzzy
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -5981,7 +5981,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -5989,7 +5989,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -6000,35 +6000,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -6036,7 +6036,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -6044,7 +6044,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -6054,19 +6054,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -6074,7 +6074,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -6083,13 +6083,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 #, fuzzy
 msgid "<literal>Tree</literal> Section"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -6099,7 +6099,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -6108,7 +6108,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -6116,7 +6116,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -6126,7 +6126,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -6134,7 +6134,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -6142,7 +6142,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -6150,37 +6150,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 #, fuzzy
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -6190,54 +6190,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -6247,19 +6247,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -6270,12 +6270,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -6283,12 +6283,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -6296,7 +6296,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -6310,14 +6310,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -6326,7 +6326,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -6335,7 +6335,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -6345,7 +6345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -6353,14 +6353,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -6369,7 +6369,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -6383,7 +6383,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -6393,53 +6393,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
 msgstr ""
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr ""
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr ""
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
 msgstr ""
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
 msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -6447,42 +6463,42 @@ msgid ""
 "or (at your option) any later version."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -6491,8 +6507,8 @@ msgid ""
 "in mail transport agents, X servers and so on."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -6500,8 +6516,8 @@ msgid ""
 "properly."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -6509,8 +6525,8 @@ msgid ""
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -6522,8 +6538,8 @@ msgid ""
 "other mail transport agents."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -6535,8 +6551,8 @@ msgid ""
 "trying to manually fix packages."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -6544,71 +6560,77 @@ msgid ""
 "packages for installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:102
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
 msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:109
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
 msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -6619,130 +6641,134 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
 msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed 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 used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> 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 <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:198
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:222
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
 msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -6750,25 +6776,25 @@ msgid ""
 "restrictions placed on their use and distribution."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -6776,57 +6802,63 @@ msgid ""
 "them together."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:280
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -6834,17 +6866,17 @@ msgid ""
 "warning will be printed when apt-get exits."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -6854,18 +6886,18 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -6874,61 +6906,69 @@ msgid ""
 "problem is also included."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:351
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
 msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -6936,135 +6976,135 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
 "This should only happen during dist-upgrade or install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -7081,27 +7121,27 @@ msgid ""
 "the amount of space that will be freed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -7110,110 +7150,107 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:542
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
 msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
 msgstr ""
 
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr ""
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -7221,8 +7258,8 @@ msgid ""
 "fast connection but they are physically distant."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -7230,13 +7267,13 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -7244,13 +7281,13 @@ msgid ""
 "names such as ext2, fat32 or vfat."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -7258,8 +7295,8 @@ msgid ""
 "to download. The disk directory structure should look like:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -7269,34 +7306,35 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -7304,10 +7342,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -7318,76 +7356,78 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:142
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -7396,21 +7436,21 @@ msgid ""
 "status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -7418,38 +7458,38 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 #, fuzzy
 msgid "Operation"
 msgstr "Descrição"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -7457,35 +7497,35 @@ msgid ""
 "output on the disc."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
diff --git a/doc/po4a.conf b/doc/po4a.conf
index 3f92c198a..636cac9b9 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -27,18 +27,18 @@
 [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: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml
-#                 add_$lang::$lang/addendum/debiandoc_$lang.add
-[type: sgml]    offline.sgml $lang:$lang/offline.$lang.sgml
-#                 add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    cache.sgml $lang:$lang/cache.$lang.sgml \
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    design.sgml $lang:$lang/design.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    dpkg-tech.sgml $lang:$lang/dpkg-tech.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    files.sgml $lang:$lang/files.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    method.sgml $lang:$lang/method.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
+[type: docbook] guide.dbk $lang:$lang/guide.$lang.dbk
+#                add_$lang::$lang/addendum/docbook_$lang.add
+[type: docbook] offline.dbk $lang:$lang/offline.$lang.dbk
+#                add_$lang::$lang/addendum/docbook_$lang.add
+#[type: docbook] cache.dbk $lang:$lang/cache.$lang.dbk \
+#                add_$lang::$lang/addendum/docbook_$lang.add
+#[type: docbook] design.dbk $lang:$lang/design.$lang.dbk\
+#                add_$lang::$lang/addendum/docbook_$lang.add
+#[type: docbook] dpkg-tech.dbk $lang:$lang/dpkg-tech.$lang.dbk\
+#                add_$lang::$lang/addendum/docbook_$lang.add
+#[type: docbook] files.dbk $lang:$lang/files.$lang.dbk\
+#                add_$lang::$lang/addendum/docbook_$lang.add
+#[type: docbook] method.dbk $lang:$lang/method.$lang.dbk\
+#                add_$lang::$lang/addendum/docbook_$lang.add
 
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 4d0c4d502..da4f571b5 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -1,15 +1,9 @@
 <?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;
-
-<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
-%aptvendor;
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;
 ]>
 
 <refentry>
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index ba71ee225..ebf99a8f8 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -781,33 +781,14 @@ static bool SimpleGenRelease(CommandLine &CmdL)
 }
 
 									/*}}}*/
-// Generate - Full generate, using a config file			/*{{{*/
+// DoGeneratePackagesAndSources - Helper for Generate                   /*{{{*/
 // ---------------------------------------------------------------------
-/* */
-static bool Generate(CommandLine &CmdL)
+static bool DoGeneratePackagesAndSources(Configuration &Setup,
+					 vector<PackageMap> &PkgList,
+					 struct CacheDB::Stats &SrcStats,
+					 struct CacheDB::Stats &Stats,
+					 CommandLine &CmdL)
 {
-   struct CacheDB::Stats SrcStats;
-   if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL);
-
-   struct timeval StartTime;
-   gettimeofday(&StartTime,0);   
-   struct CacheDB::Stats Stats;
-   
-   // Read the configuration file.
-   Configuration Setup;
-   if (ReadConfigFile(Setup,CmdL.FileList[1],true) == false)
-      return false;
-
-   vector<PackageMap> PkgList;
-   LoadTree(PkgList,Setup);
-   LoadBinDir(PkgList,Setup);
-
-   // Sort by cache DB to improve IO locality.
-   stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare());
-   stable_sort(PkgList.begin(),PkgList.end(),PackageMap::SrcDBCompare());
-		
-   // Generate packages
    if (CmdL.FileSize() <= 2)
    {
       for (vector<PackageMap>::iterator I = PkgList.begin(); I != PkgList.end(); ++I)
@@ -876,9 +857,16 @@ static bool Generate(CommandLine &CmdL)
       if (I->TransWriter != NULL && I->TransWriter->DecreaseRefCounter() == 0)
 	 delete I->TransWriter;
 
-   if (_config->FindB("APT::FTPArchive::Contents",true) == false)
-      return true;
-   
+   return true;
+}
+
+                                                                        /*}}}*/
+// DoGenerateContents - Helper for Generate to generate the Contents    /*{{{*/
+// ---------------------------------------------------------------------
+static bool DoGenerateContents(Configuration &Setup,
+			       vector<PackageMap> &PkgList,
+			       CommandLine &CmdL)
+{
    c1out << "Packages done, Starting contents." << endl;
 
    // Sort the contents file list by date
@@ -935,17 +923,62 @@ static bool Generate(CommandLine &CmdL)
 	 break;
       }      
    }
+
+   return true;
+}
+
+									/*}}}*/
+// Generate - Full generate, using a config file			/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+static bool Generate(CommandLine &CmdL)
+{
+   struct CacheDB::Stats SrcStats;
+   if (CmdL.FileSize() < 2)
+      return ShowHelp(CmdL);
+
+   struct timeval StartTime;
+   gettimeofday(&StartTime,0);
+   struct CacheDB::Stats Stats;
    
+   // Read the configuration file.
+   Configuration Setup;
+   if (ReadConfigFile(Setup,CmdL.FileList[1],true) == false)
+      return false;
+
+   vector<PackageMap> PkgList;
+   LoadTree(PkgList,Setup);
+   LoadBinDir(PkgList,Setup);
+
+   // Sort by cache DB to improve IO locality.
+   stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare());
+   stable_sort(PkgList.begin(),PkgList.end(),PackageMap::SrcDBCompare());
+
+   // Generate packages
+   if (_config->FindB("APT::FTPArchive::ContentsOnly", false) == false)
+   {
+      if(DoGeneratePackagesAndSources(Setup, PkgList, SrcStats, Stats, CmdL) == false)
+         return false;
+   } else {
+      c1out << "Skipping Packages/Sources generation" << endl;
+   }
+
+   // do Contents if needed
+   if (_config->FindB("APT::FTPArchive::Contents", true) == true)
+      if (DoGenerateContents(Setup, PkgList, CmdL) == false)
+         return false;
+
    struct timeval NewTime;
-   gettimeofday(&NewTime,0);   
-   double Delta = NewTime.tv_sec - StartTime.tv_sec + 
+   gettimeofday(&NewTime,0);
+   double Delta = NewTime.tv_sec - StartTime.tv_sec +
                   (NewTime.tv_usec - StartTime.tv_usec)/1000000.0;
-   c1out << "Done. " << SizeToStr(Stats.Bytes) << "B in " << Stats.Packages 
+   c1out << "Done. " << SizeToStr(Stats.Bytes) << "B in " << Stats.Packages
          << " archives. Took " << TimeToStr((long)Delta) << endl;
-   
+
    return true;
 }
-									/*}}}*/
+
+                                                                        /*}}}*/
 // Clean - Clean out the databases					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/methods/http.cc b/methods/http.cc
index c734d3799..f2a4a4db6 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -34,6 +34,7 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/proxy.h>
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -304,6 +305,7 @@ bool HttpServerState::Open()
    Persistent = true;
    
    // Determine the proxy setting
+   AutoDetectProxy(ServerName);
    string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
    if (!SpecificProxy.empty())
    {
@@ -744,7 +746,7 @@ void HttpMethod::SendReq(FetchItem *Itm)
    Req << "\r\n";
 
    if (Debug == true)
-      cerr << Req << endl;
+      cerr << Req.str() << endl;
 
    Server->WriteResponse(Req.str());
 }
@@ -762,66 +764,6 @@ bool HttpMethod::Configuration(string Message)
 				  PipelineDepth);
    Debug = _config->FindB("Debug::Acquire::http",false);
 
-   // Get the proxy to use
-   AutoDetectProxy();
-
-   return true;
-}
-									/*}}}*/
-// HttpMethod::AutoDetectProxy - auto detect proxy			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool HttpMethod::AutoDetectProxy()
-{
-   // option is "Acquire::http::Proxy-Auto-Detect" but we allow the old
-   // name without the dash ("-")
-   AutoDetectProxyCmd = _config->Find("Acquire::http::Proxy-Auto-Detect",
-                                      _config->Find("Acquire::http::ProxyAutoDetect"));
-
-   if (AutoDetectProxyCmd.empty())
-      return true;
-
-   if (Debug)
-      clog << "Using auto proxy detect command: " << AutoDetectProxyCmd << endl;
-
-   int Pipes[2] = {-1,-1};
-   if (pipe(Pipes) != 0)
-      return _error->Errno("pipe", "Failed to create Pipe");
-
-   pid_t Process = ExecFork();
-   if (Process == 0)
-   {
-      close(Pipes[0]);
-      dup2(Pipes[1],STDOUT_FILENO);
-      SetCloseExec(STDOUT_FILENO,false);
-
-      const char *Args[2];
-      Args[0] = AutoDetectProxyCmd.c_str();
-      Args[1] = 0;
-      execv(Args[0],(char **)Args);
-      cerr << "Failed to exec method " << Args[0] << endl;
-      _exit(100);
-   }
-   char buf[512];
-   int InFd = Pipes[0];
-   close(Pipes[1]);
-   int res = read(InFd, buf, sizeof(buf)-1);
-   ExecWait(Process, "ProxyAutoDetect", true);
-
-   if (res < 0)
-      return _error->Errno("read", "Failed to read");
-   if (res == 0)
-      return _error->Warning("ProxyAutoDetect returned no data");
-
-   // add trailing \0
-   buf[res] = 0;
-
-   if (Debug)
-      clog << "auto detect command returned: '" << buf << "'" << endl;
-
-   if (strstr(buf, "http://") == buf)
-      _config->Set("Acquire::http::proxy", _strstrip(buf));
-
    return true;
 }
 									/*}}}*/
diff --git a/methods/http.h b/methods/http.h
index 5406ce4a7..1df9fa07d 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -124,9 +124,6 @@ class HttpMethod : public ServerMethod
    public:
    virtual void SendReq(FetchItem *Itm);
 
-   /** \brief Try to AutoDetect the proxy */
-   bool AutoDetectProxy();
-
    virtual bool Configuration(std::string Message);
 
    virtual ServerState * CreateServerState(URI uri);
diff --git a/methods/https.cc b/methods/https.cc
index e0348ab58..0499af0c5 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -20,6 +20,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/proxy.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -107,6 +108,9 @@ void HttpsMethod::SetupProxy()  					/*{{{*/
 {
    URI ServerName = Queue->Uri;
 
+   // Determine the proxy setting
+   AutoDetectProxy(ServerName);
+
    // Curl should never read proxy settings from the environment, as
    // we determine which proxy to use.  Do this for consistency among
    // methods and prevent an environment variable overriding a
diff --git a/methods/server.cc b/methods/server.cc
index 5a13f18a7..92d94e638 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -44,7 +44,8 @@ time_t ServerMethod::FailTime = 0;
 // ---------------------------------------------------------------------
 /* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header
    parse error occurred */
-ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File)
+ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File,
+                                                      const std::string &Uri)
 {
    State = Header;
    
@@ -66,7 +67,7 @@ ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File)
 	 continue;
 
       if (Owner->Debug == true)
-	 clog << Data;
+	 clog << "Answer for: " << Uri << endl << Data;
       
       for (string::const_iterator I = Data.begin(); I < Data.end(); ++I)
       {
@@ -478,7 +479,7 @@ int ServerMethod::Loop()
       Fetch(0);
       
       // Fetch the next URL header data from the server.
-      switch (Server->RunHeaders(File))
+      switch (Server->RunHeaders(File, Queue->Uri))
       {
 	 case ServerState::RUN_HEADERS_OK:
 	 break;
diff --git a/methods/server.h b/methods/server.h
index 0f45ab994..f5e68d902 100644
--- a/methods/server.h
+++ b/methods/server.h
@@ -68,7 +68,7 @@ struct ServerState
       RUN_HEADERS_PARSE_ERROR
    };
    /** \brief Get the headers before the data */
-   RunHeadersResult RunHeaders(FileFd * const File);
+   RunHeadersResult RunHeaders(FileFd * const File, const std::string &Uri);
 
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
    virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0;
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 28393d95c..d2229a936 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.4ubuntu1\n"
+"Project-Id-Version: apt 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -95,74 +95,74 @@ msgstr ""
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -275,7 +275,7 @@ msgid "Couldn't find package %s"
 msgstr ""
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
@@ -303,7 +303,7 @@ msgstr ""
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
@@ -329,7 +329,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr ""
 
@@ -371,103 +371,103 @@ msgstr ""
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, 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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -513,15 +513,19 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -530,6 +534,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -559,8 +564,9 @@ msgstr ""
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -750,7 +756,7 @@ msgstr ""
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr ""
 
@@ -796,7 +802,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr ""
 
@@ -924,142 +930,225 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr ""
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr ""
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr ""
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr ""
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr ""
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr ""
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr ""
+
+#: apt-private/acqprogress.cc:146
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
+
+#: apt-private/acqprogress.cc:236
+#, c-format
+msgid " [Working]"
+msgstr ""
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+
+#: 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-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+
+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr ""
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\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
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr ""
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1067,37 +1156,37 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr ""
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr ""
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr ""
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr ""
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1107,15 +1196,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1131,15 +1220,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1148,7 +1237,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1156,7 +1245,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
@@ -1172,7 +1261,7 @@ msgid ""
 "solution)."
 msgstr ""
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1180,68 +1269,68 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr ""
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr ""
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr ""
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1249,32 +1338,12 @@ msgid_plural ""
 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-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
+#: 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-output.cc:103 apt-private/private-show.cc:84
@@ -1282,126 +1351,126 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 msgid "[installed,local]"
 msgstr ""
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 msgid "[installed,automatic]"
 msgstr ""
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 msgid "[installed]"
 msgstr ""
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr ""
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr ""
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr ""
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr ""
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr ""
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr ""
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
@@ -1410,7 +1479,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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1418,37 +1487,29 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
 #: apt-private/private-show.cc:156
 #, c-format
 msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1461,35 +1522,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr ""
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr ""
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr ""
-
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1500,70 +1532,44 @@ msgstr ""
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
-msgstr ""
-
-#: 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/acqprogress.cc:66
-msgid "Hit "
-msgstr ""
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr ""
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr ""
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
 msgstr ""
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/private-update.cc:90
 #, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
-#: apt-private/acqprogress.cc:236
-#, c-format
-msgid " [Working]"
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
 msgstr ""
 
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
+#: apt-private/private-upgrade.cc:28
+msgid "Done"
 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1635,361 +1641,530 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: 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-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
+#: cmdline/apt-extracttemplates.cc:254
+#, c-format
+msgid "Unable to mkstemp %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Double add of diversion %s -> %s"
+msgid "Error processing directory %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "The path %s is too long"
+msgid "Error processing contents %s"
 msgstr ""
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Unpacking %s more than once"
+msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:65
 #, c-format
-msgid "The directory %s is diverted"
+msgid "DB was corrupted, file renamed to %s.old"
 msgstr ""
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:83
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "DB is old, attempting to upgrade %s"
 msgstr ""
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
 msgstr ""
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:332
+msgid "Failed to read .dsc"
+msgstr ""
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr ""
+
+#: ftparchive/cachedb.cc:594
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Failed to rename %s to %s"
+msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:96
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
+#: ftparchive/writer.cc:152
+msgid "E: "
 msgstr ""
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
+#: ftparchive/writer.cc:154
+msgid "W: "
 msgstr ""
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr ""
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
 #, c-format
-msgid "Overwrite package match with no version for %s"
+msgid "Failed to resolve %s"
 msgstr ""
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr ""
+
+#: ftparchive/writer.cc:219
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+msgid "Failed to open %s"
 msgstr ""
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:278
 #, c-format
-msgid "Unable to stat %s"
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:286
 #, c-format
-msgid "Failed to write file %s"
+msgid "Failed to readlink %s"
 msgstr ""
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:290
 #, c-format
-msgid "Failed to close file %s"
+msgid "Failed to unlink %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:298
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:308
 #, c-format
-msgid "Internal error, could not locate member %s"
+msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: ftparchive/writer.cc:417
+msgid "Archive had no package field"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:706
 #, c-format
-msgid "Invalid archive member header %s"
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/override.cc:191
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:57
+#: ftparchive/multicompress.cc:73
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: 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 "Packaging system '%s' is not supported"
+msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr ""
+
+#: ftparchive/multicompress.cc:359
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "Problem unlinking %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: cmdline/apt-internal-solver.cc:49
+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 ""
+
+#: 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-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "Failed to write file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/dirstream.cc:105
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Failed to close file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "The path %s is too long"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Hash mismatch for: %s"
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-inst/extract.cc:142
+#, c-format
+msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-inst/extract.cc:152
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
+#: apt-inst/extract.cc:249
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: apt-inst/extract.cc:498
+#, c-format
+msgid "Unable to stat %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
+#: apt-inst/contrib/arfile.cc:96
+#, c-format
+msgid "Invalid archive member header %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#, c-format
+msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/acquire.cc:91
+#, c-format
+msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/acquire.cc:99
+#, c-format
+msgid "Unable to lock directory %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, c-format
-msgid "Failed to open StateFile %s"
+msgid "Clean of %s is not supported"
 msgstr ""
 
-#: apt-pkg/depcache.cc:256
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to write temporary StateFile %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
+
+#: apt-pkg/acquire.cc:904
+#, c-format
+msgid "Retrieving file %li of %li"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
@@ -2009,35 +2184,35 @@ msgstr ""
 msgid "Invalid file format"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2045,178 +2220,127 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: 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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 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"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "List directory %spartial is missing."
+msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Archives directory %spartial is missing."
+msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Unable to lock directory %s"
+msgid "Couldn't find task '%s'"
 msgstr ""
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:615
 #, c-format
-msgid "Retrieving file %li of %li"
-msgstr ""
-
-#: 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"
+msgid "Couldn't find any package by glob '%s'"
 msgstr ""
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, 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 ""
-
-#: apt-pkg/policy.cc:444
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr ""
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
@@ -2295,50 +2419,85 @@ msgstr ""
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
+#: 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/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr ""
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr ""
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:78
@@ -2366,295 +2525,417 @@ msgstr ""
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
+msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid "Could not configure '%s'. "
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/packagemanager.cc:630
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
+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/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:174
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr ""
+
+#: 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: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 %s"
+msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:416
+#: 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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Release '%s' for '%s' was not found"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/policy.cc:422
 #, c-format
-msgid "Version '%s' for '%s' was not found"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Couldn't find task '%s'"
+msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
+msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Couldn't find any package by glob '%s'"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid "Installing %s"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid "Configuring %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Removing %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Completely removing %s"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "Opening %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Directory '%s' missing"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid "Could not open file '%s'"
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Preparing %s"
+msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Unpacking %s"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: 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/vendorlist.cc:85
 #, c-format
-msgid "Preparing to configure %s"
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Installed %s"
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr ""
+
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Preparing for removal of %s"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removed %s"
+msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Preparing to completely remove %s"
+msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removed %s"
+msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
+#: 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 ""
 
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Can not write log (%s)"
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1069
-msgid "Is /dev/pts mounted?"
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:190
@@ -2770,53 +3051,10 @@ msgstr ""
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Error!"
-msgstr ""
-
-#: apt-pkg/contrib/progress.cc:150
-#, c-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
-#, c-format
-msgid "%c%s... %u%%"
-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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
+msgid "No keyring installed in %s."
 msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:79
@@ -2869,442 +3107,212 @@ 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 ""
-
-#: 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 ""
-
-#: apt-pkg/contrib/configuration.cc:633
-#, c-format
-msgid "Opening configuration file %s"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:801
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:820
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:837
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:897
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:950
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, 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 ""
-
-#: 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/contrib/cmndline.cc:168
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Option %s requires an argument."
+msgid "%c%s... Done"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+msgid "%c%s... %u%%"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option '%s' is too long"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Sense %s is not understood, try true or false."
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:391
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Invalid operation %s"
-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"
+msgid "%limin %lis"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:254
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Unable to mkstemp %s"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
+msgid "%lis"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Error processing directory %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
+msgid "Selection %s not found"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Error processing contents %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:626
 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:841
-msgid "No selections matched"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#: ftparchive/cachedb.cc:65
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
+msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:94
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr ""
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr ""
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr ""
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: 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 ""
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "Installing %s"
 msgstr ""
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "Failed to readlink %s"
+msgid "Configuring %s"
 msgstr ""
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to unlink %s"
+msgid "Removing %s"
 msgstr ""
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "*** Failed to link %s to %s"
+msgid "Completely removing %s"
 msgstr ""
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "Directory '%s' missing"
 msgstr ""
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "Could not open file '%s'"
 msgstr ""
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
+msgid "Preparing %s"
 msgstr ""
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "Unable to open %s"
+msgid "Unpacking %s"
 msgstr ""
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
+msgid "Preparing to configure %s"
 msgstr ""
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "Installed %s"
 msgstr ""
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
+msgid "Preparing for removal of %s"
 msgstr ""
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
+msgid "Removed %s"
 msgstr ""
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
+msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
+msgid "Completely removed %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:103
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, c-format
-msgid "Compressed output %s needs a compression set"
+msgid "Can not write log (%s)"
 msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
 msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 175275a23..c4069143e 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -101,75 +101,75 @@ msgstr "مجموع المساحة المحسوب حسابها:"
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "يجب أن تعطي صيغة واحدة بالضبط"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "مل�ات الحزم:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "الحزم الم�دبّسة:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(غير موجود)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr " م�ثبّت:"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  مرشّح: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(لاشيء)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr " جدول النسخ:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -283,7 +283,7 @@ msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
@@ -311,7 +311,7 @@ msgstr "تعذر قَ�ْل دليل التنزيل"
 msgid "Must specify at least one package to fetch source for"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "تعذر العثور على مصدر الحزمة %s"
@@ -337,7 +337,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "تخطي المل� '%s' المنزل مسبقاً\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "تعذر حساب المساحة الحرة �ي %s"
@@ -370,7 +370,7 @@ msgstr "إحضار المصدر %s\n"
 msgid "Failed to fetch some archives."
 msgstr "�شل إحضار بعض الأرشي�ات."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "اكتمل التنزيل و�ي وضع التنزيل �قط"
 
@@ -379,103 +379,103 @@ msgstr "اكتمل التنزيل و�ي وضع التنزيل �قط"
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "أمر �ك الحزمة '%s' �شل.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "أمر البناء '%s' �شل.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, 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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "الاتصال بـ%s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -521,16 +521,20 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -539,6 +543,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -568,8 +573,9 @@ msgstr "%s هي النسخة الأحدث.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -763,7 +769,7 @@ msgstr ""
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "�شل"
 
@@ -809,7 +815,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr ""
 
@@ -937,142 +943,228 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "خطأ �ي الكتابة إلى المل�"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "خطأ �ي القراءة من الخادم. أق�ل الطر� الآخر الاتصال"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "خطأ �ي القراءة من الخادم"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "خطأ �ي الكتابة إلى المل�"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "�شل التحديد"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "خطأ �ي الكتابة إلى مل� الم�خرجات"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "بانتظار الترويسات"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "سطر ترويسة سيء"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "أرسل خادم http ترويسة طول محتويات (�Content-Length) غير صالحة"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "أرسل خادم http ترويسة مدى محتويات (�Content-Range) غير صالحة"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "خادم http له دعم مدى معطوب"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "نسق تاريخ مجهول"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "�شل الاتصال"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr ""
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "جلب:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "تجاهل"
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "خطأ"
+
+#: apt-private/acqprogress.cc:146
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "جلب %sب �ي %s (%sب/ث)\n"
+
+#: apt-private/acqprogress.cc:236
+#, c-format
+msgid " [Working]"
+msgstr " [يعمل]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"تغيير الوسط: الرجاء إدخال القرص الم�سمّى\n"
+" '%s'\n"
+"�ي السوّاقة '%s' وضغط م�تاح الإدخال\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "تم غض النظر عن تحذير المصادقة.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "تعذرت المصادقة على بعض الحزم"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "تثبيت هذه الحزم دون التحقق منها؟"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "�شل إحضار %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "حزم بحاجة للإزالة لكن الإزالة م�عطّلة."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم تنته عملية الترتيب"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "بعد الاستخراج %sب من المساحة ست�رّغ.\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "ليس هناك مساحة كا�ية �ي %s."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "نعم، ا�عل ما أقوله!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1083,19 +1175,19 @@ msgstr ""
 "كي تستمر اكتب العبارة '%s'\n"
 " ØŸ] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "إجهاض."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "هل تريد الاستمرار؟"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "�شل تنزيل بعض المل�ات"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1103,19 +1195,19 @@ msgstr ""
 "تعذر إحضار بعض الأرشي�، ربما يمكنك محاولة تن�يذ apt-get update أو إضا�ة --"
 "fix-missingØŸ"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "تعذر تصحيح الحزم الم�قودة."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "إجهاض التثبيت."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1125,15 +1217,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1149,16 +1241,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "قد تساعد المعلومات التالية �ي حل المشكلة:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1168,7 +1260,7 @@ msgid_plural ""
 msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1176,7 +1268,7 @@ msgid_plural ""
 msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
@@ -1193,7 +1285,7 @@ msgid ""
 msgstr ""
 "م�عتمدات غير مستو�اة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1201,68 +1293,68 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "حزم معطوبة"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "سيتم تثبيت الحزم الإضا�يّة التالية:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "الحزم المقترحة:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "الحزم المستحسنة:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "الحزمة %s غير م�ثبّتة، لذلك لن ت�زال\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "الحزمة %s غير م�ثبّتة، لذلك لن ت�زال\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1270,136 +1362,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [م�ثبّتة]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [م�ثبّتة]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [م�ثبّتة]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [م�ثبّتة]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "إلا أن %s مثبت"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "إلا أنه غير قابل للتثبيت"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "إلا أنها حزمة وهمية"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "إلا أنها غير مثبتة"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "إلا أنه لن يتم تثبيتها"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " أو"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "سيتم إزالة الحزم التالية:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "سيتم الإبقاء على الحزم التالية:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "ستتم ترقية الحزم التالية:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "سيتم تثبيط الحزم التالية:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "سيتم تغيير الحزم المبقاة التالية:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (بسبب %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1407,27 +1479,27 @@ msgstr ""
 "تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
 "لا يجب أن تقوم بهذا إلى إن كنت تعر� تماماً ما تقوم به!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu أعيد تثبيتها، "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu مثبطة، "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
@@ -1436,7 +1508,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[Y/n]"
 
@@ -1444,36 +1516,28 @@ msgstr "[Y/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1487,35 +1551,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "تم غض النظر عن تحذير المصادقة.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "تعذرت المصادقة على بعض الحزم"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "تثبيت هذه الحزم دون التحقق منها؟"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "�شل إحضار %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1526,74 +1561,44 @@ msgstr "�شل تغيير اسم %s إلى %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "لا يقبل الأمر update أية م�عطيات"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "تمّ"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr ""
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "جلب:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "تجاهل"
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "خطأ"
-
-#: apt-private/acqprogress.cc:146
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "جلب %sب �ي %s (%sب/ث)\n"
-
-#: apt-private/acqprogress.cc:236
-#, c-format
-msgid " [Working]"
-msgstr " [يعمل]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"تغيير الوسط: الرجاء إدخال القرص الم�سمّى\n"
-" '%s'\n"
-"�ي السوّاقة '%s' وضغط م�تاح الإدخال\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "تعذرت قراءة %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1667,36 +1672,356 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها Ù
 msgid "Merging available information"
 msgstr "دمج المعلومات المتو�رة"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: 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-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "تعذر إنشاء %s"
+
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "تعذرت الكتابة إلى %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
+
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "قائمة توسيعات الحزمة طويلة جداً"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#, c-format
+msgid "Error processing directory %s"
+msgstr "خطأ �ي معالجة الدليل %s"
+
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "قائمة توسيعات المصدر طويلة جداً"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "خطأ �ي كتابة الترويسة إلى مل� المحتويات"
+
+#: ftparchive/apt-ftparchive.cc:431
+#, c-format
+msgid "Error processing contents %s"
+msgstr "خطأ �ي معالجة المحتويات %s"
+
+#: ftparchive/apt-ftparchive.cc:626
+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-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: ftparchive/apt-ftparchive.cc:822
+msgid "No selections matched"
+msgstr "لم ت�طابق أية تحديدات"
+
+#: ftparchive/apt-ftparchive.cc:907
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "بعض المل�ات م�قودة �ي مجموعة مل� الحزمة `%s'"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "قاعدة البيانات كانت �اسدة، �تم تغيير اسمها إلى %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
+
+#: ftparchive/cachedb.cc:94
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "خطأ داخلي �ي AddDiversion"
+#: ftparchive/cachedb.cc:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "تعذر �تح مل� قاعدة البيانات %s: %s"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Failed to stat %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "تعذرت إزالة %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr ""
+
+#: ftparchive/cachedb.cc:594
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Double add of diversion %s -> %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 ""
 
-#: apt-inst/filelist.cc:549
+#: 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 "Duplicate conf file %s/%s"
-msgstr "مل� تهيئة م�زدوج %s/%s"
+msgid "Failed to resolve %s"
+msgstr ""
+
+#: 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 ""
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr ""
+
+#: 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 ""
+
+#: ftparchive/writer.cc:417
+msgid "Archive had no package field"
+msgstr ""
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr ""
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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 ""
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr ""
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr ""
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr ""
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr ""
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr ""
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr ""
+
+#: 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 ""
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "�شل تغيير اسم %s إلى %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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 ""
+
+#: 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-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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1722,17 +2047,6 @@ msgstr ""
 msgid "The diversion path is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: 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"
@@ -1761,31 +2075,37 @@ msgstr ""
 msgid "Unable to stat %s"
 msgstr ""
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr ""
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "�شل إغلاق المل� %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr ""
 
-#: 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"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "خطأ داخلي �ي AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "خطأ داخلي، تعذر العثور على العضو %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr ""
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "مل� تهيئة م�زدوج %s/%s"
+
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
 msgstr "توقيع الأرشي� غير صالح"
@@ -1832,199 +2152,53 @@ msgstr "�شل تحقّق Checksum لمل� Tar، الأرشي� �اسد"
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "نظام الحزم '%s' غير مدعوم"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+msgid "Internal error, could not locate member %s"
+msgstr "خطأ داخلي، تعذر العثور على العضو %s"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:99
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "MD5Sum غير متطابقة"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "قد يساعدك تن�يذ الأمر apt-get update �ي تصحيح هذه المشاكل"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "تعذرت قراءة قائمة المصادر."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:174
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "يعتمد"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "يعتمد مسبقاً"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "يستحسن"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "يقترح"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "يعارض"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "يستبدل"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "ي�لغي"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "مهم"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "مطلوب"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "قياسي"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "اختياري"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "إضا�ي"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
+msgid "Unable to lock directory %s"
+msgstr "تعذر ق�ل دليل القائمة"
 
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "نظام الحزم '%s' غير مدعوم"
 
-#: apt-pkg/acquire-worker.cc:169
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "الرجاء إدخال القرص الم�سمّى  '%s' �ي السوّاقة '%s' وضغط م�تاح الإدخال."
-
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-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"
+msgid "Retrieving file %li of %li"
 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 "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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
@@ -2044,35 +2218,35 @@ msgstr "الحجم غير متطابق"
 msgid "Invalid file format"
 msgstr "عمليّة غير صالحة %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "تعذر �تح مل� قاعدة البيانات %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2080,178 +2254,127 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: 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: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-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid "Is the package %s installed?"
 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 "قراءة قوائم الحزم"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Unable to write to %s"
-msgstr "تعذرت الكتابة إلى %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "الرجاء إدخال القرص الم�سمّى  '%s' �ي السوّاقة '%s' وضغط م�تاح الإدخال."
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: 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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/acquire.cc:91
-#, c-format
-msgid "Archives directory %spartial is missing."
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/acquire.cc:99
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "تعذر ق�ل دليل القائمة"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "قد يساعدك تن�يذ الأمر apt-get update �ي تصحيح هذه المشاكل"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "تعذرت قراءة قائمة المصادر."
+
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
+msgid "Release '%s' for '%s' was not found"
+msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Retrieving file %li of %li"
-msgstr ""
+msgid "Version '%s' for '%s' was not found"
+msgstr "تعذر العثور على النسخة '%s' للحزمة '%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/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "تعذر العثور على الحزمة %s"
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "تعذر العثور على الحزمة %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "تعذر العثور على الحزمة %s"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Did not understand pin type %s"
-msgstr ""
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "�شل إغلاق المل� %s"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
@@ -2332,52 +2455,88 @@ msgstr "كتابة لائحة المصادر الجديدة\n"
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr ""
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "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/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
+#: 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 ""
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "MD5Sum غير متطابقة"
+
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2403,6 +2562,209 @@ msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "تعذر �تح مل� قاعدة البيانات %s: %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "نظام الحزم '%s' غير مدعوم"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "�شل إغلاق المل� %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "يعتمد"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "يعتمد مسبقاً"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "يستحسن"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "يقترح"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "يعارض"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "يستبدل"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "ي�لغي"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "مهم"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "مطلوب"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "قياسي"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "اختياري"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "إضا�ي"
+
+#: 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: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-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %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 "قراءة قوائم الحزم"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr ""
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr ""
+
 #: apt-pkg/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2478,220 +2840,139 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "تعذر العثور على الحزمة %s"
+msgid "Unable to parse package file %s (1)"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "تم تثبيت %s"
-
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "تهيئة %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "خيار سطر الأمر '%c' [من %s] مجهول."
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "إزالة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "تمت إزالة %s بالكامل"
+msgid "Command line option %s is not understood"
+msgstr "خيار سطر الأمر %s غير م�هوم"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
+msgid "Option %s requires an argument."
+msgstr "الخيار %s يتطلّب م�عطى."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Directory '%s' missing"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: 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:989
-#, c-format
-msgid "Preparing %s"
-msgstr "تحضير %s"
-
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Unpacking %s"
-msgstr "�تح %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "التحضير لتهيئة %s"
+msgid "Option '%s' is too long"
+msgstr "الخيار '%s' طويل جداً"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Installed %s"
-msgstr "تم تثبيت %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "التحضير لإزالة %s"
+msgid "Invalid operation %s"
+msgstr "عمليّة غير صالحة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Removed %s"
-msgstr "تم إزالة %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "اختصار نوع مجهول: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "التحضير لإزالة %s بالكامل"
+msgid "Opening configuration file %s"
+msgstr "�تح مل� التهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Completely removed %s"
-msgstr "تمت إزالة %s بالكامل"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: 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:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:190
@@ -2807,54 +3088,11 @@ msgstr "مشكلة �ي إغلاق المل�"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... تمّ"
-
-#. 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"
+msgid "No keyring installed in %s."
+msgstr "إجهاض التثبيت."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -2909,447 +3147,220 @@ 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 ""
-
-#: 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 ""
-
-#: apt-pkg/contrib/configuration.cc:820
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:837
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr ""
+msgid "%c%s... Error!"
+msgstr "%c%s... خطأ!"
 
-#: apt-pkg/contrib/configuration.cc:900
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
+msgid "%c%s... Done"
+msgstr "%c%s... تمّ"
 
-#: apt-pkg/contrib/configuration.cc:950
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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 غير م�هوم"
+msgid "%c%s... %u%%"
+msgstr "%c%s... تمّ"
 
-#: apt-pkg/contrib/cmndline.cc:168
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: 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
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "الخيار '%s' طويل جداً"
-
-#: apt-pkg/contrib/cmndline.cc:341
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Sense %s is not understood, try true or false."
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/contrib/strutl.cc:1258
 #, 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 ""
-
-#: 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "قائمة توسيعات الحزمة طويلة جداً"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "خطأ �ي معالجة الدليل %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "قائمة توسيعات المصدر طويلة جداً"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "خطأ �ي كتابة الترويسة إلى مل� المحتويات"
+msgid "Selection %s not found"
+msgstr "تعذر العثور على التحديد %s"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Error processing contents %s"
-msgstr "خطأ �ي معالجة المحتويات %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:841
-msgid "No selections matched"
-msgstr "لم ت�طابق أية تحديدات"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "بعض المل�ات م�قودة �ي مجموعة مل� الحزمة `%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "قاعدة البيانات كانت �اسدة، �تم تغيير اسمها إلى %s.old"
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "تعذر ق�ل دليل القائمة"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
-
-#: ftparchive/cachedb.cc:94
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "تعذر �تح مل� قاعدة البيانات %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "تعذرت إزالة %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr ""
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: 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 ""
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "تم تثبيت %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "Failed to resolve %s"
-msgstr ""
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr ""
+msgid "Configuring %s"
+msgstr "تهيئة %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to open %s"
-msgstr "�شل �تح %s"
+msgid "Removing %s"
+msgstr "إزالة %s"
 
-#: ftparchive/writer.cc:278
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "تمت إزالة %s بالكامل"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to readlink %s"
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Failed to unlink %s"
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: ftparchive/writer.cc:298
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** �شل ربط %s بـ%s"
-
-#: ftparchive/writer.cc:308
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
+msgid "Directory '%s' missing"
 msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "�شل إغلاق المل� %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr ""
+msgid "Preparing %s"
+msgstr "تحضير %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr ""
+msgid "Unpacking %s"
+msgstr "�تح %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - �شل تعيين الذاكرة"
+msgid "Preparing to configure %s"
+msgstr "التحضير لتهيئة %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Unable to open %s"
-msgstr "تعذر �تح %s"
+msgid "Installed %s"
+msgstr "تم تثبيت %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr ""
+msgid "Preparing for removal of %s"
+msgstr "التحضير لإزالة %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr ""
+msgid "Removed %s"
+msgstr "تم إزالة %s"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "التحضير لإزالة %s بالكامل"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "تمت إزالة %s بالكامل"
 
-#: ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "تعذرت الكتابة إلى %s"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
 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"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
 msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
 msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "سجل حزمة مجهول!"
-
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ليس حزمة DEB صالحة."
 
diff --git a/po/ast.po b/po/ast.po
index 9a0ce0674..629c8f2da 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -94,75 +94,75 @@ msgstr "Informe del total d'espaciu: "
 msgid "Package file %s is out of sync."
 msgstr "El ficheru de paquetes %s nun ta sincronizáu."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Has de dar polo menos un patrón de gueta"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nun pue alcontrase'l paquete %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Ficheros de paquete:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Paquetes na chincheta:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(nun s'alcontró)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Instaláu: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Candidatu: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(dengún)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Chincheta de paquetes: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Tabla de versiones:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -326,7 +326,7 @@ msgid "Couldn't find package %s"
 msgstr "Nun pudo alcontrase'l paquete %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s axustáu como instaláu manualmente.\n"
@@ -354,7 +354,7 @@ msgstr "Nun pue bloquiase'l direutoriu de descarga"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nun pudo alcontrase un paquete fonte pa %s"
@@ -386,7 +386,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saltando'l ficheru yá descargáu '%s'\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nun pue determinase l'espaciu llibre de %s"
@@ -419,7 +419,7 @@ msgstr "Fonte descargada %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Falló la descarga de dellos archivos."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en mou de sólo descarga"
 
@@ -428,49 +428,49 @@ msgstr "Descarga completa y en mou de sólo descarga"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orde de desempaquetáu '%s'.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orde build '%s'.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Falló el procesu fíu"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nun tien dependencies de construcción.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,7 +479,7 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -488,14 +488,14 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -504,7 +504,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:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,30 +513,30 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Fallu al procesar les dependencies de construcción"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Coneutando a %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Módulos sofitaos:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -627,16 +627,20 @@ msgstr ""
 "pa más información y opciones.\n"
 "                       Esti APT tien Poderes de Super Vaca.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -645,6 +649,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -674,8 +679,9 @@ msgstr "%s yá ta na versión más nueva.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s yá ta na versión más nueva.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero nun taba ellí"
@@ -869,7 +875,7 @@ msgstr "Nun se pudo crear un socket"
 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Falló"
 
@@ -915,7 +921,7 @@ msgstr "Gandió'l tiempu de conexón col zócalu de datos"
 msgid "Unable to accept connection"
 msgstr "Nun se pudo aceptar la conexón"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Hebo un problema al xenerar el hash del ficheru"
 
@@ -1046,143 +1052,229 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Fallu al lleer nel sirvidor"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Falló la escoyeta"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Gandió'l tiempu de conexón"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Fallu al escribir nel ficheru de salida"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Esperando les testeres"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Fallu na llinia testera"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El sirvidor HTTP mandó una testera incorreuta de rempuesta"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Length"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Range"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Formatu de data desconocíu"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Datos de testera incorreutos"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Fallo la conexón"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Fallu internu"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Oxe "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Des:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Tresnando]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Cambeu de mediu: Por favor meti'l discu etiquetáu\n"
+" '%s'\n"
+"na unidá '%s' y calca Intro\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Avisu d'autenticación saltáu.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Dellos paquetes nun pudieron autenticase"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "¿Instalar esos paquetes ensin verificación?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Hai problemes y utilizose -y ensin --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Falló algamar %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error internu, ordenar nun finó"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Sí, ¡facer lo que digo!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1193,19 +1285,19 @@ msgstr ""
 "Pa continuar escribe la frase '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Encaboxar."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "¿Quies continuar?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Dellos ficheros nun pudieron descargase"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1213,19 +1305,19 @@ msgstr ""
 "Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o "
 "tentando --fix-missing?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Nun pudieron iguase los paquetes que falten."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Encaboxando la instalación."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1239,15 +1331,15 @@ msgstr[1] ""
 "Los siguientes paquetes desaparecieron del sistema como\n"
 "tolos ficheros fueron sobroescritos por otros paquetes:"
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1265,15 +1357,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error internu, AutoRemover rompió coses"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1284,7 +1376,7 @@ msgstr[1] ""
 "Los siguientes paquetes instaláronse de manera automática y ya nun se "
 "necesiten:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1293,7 +1385,7 @@ 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:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1312,7 +1404,7 @@ msgstr ""
 "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
 "conseña una solución)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1324,68 +1416,68 @@ msgstr ""
 "inestable, que dellos paquetes necesarios nun se crearon o que\n"
 "s'allugaron fuera d'Incoming."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Paquetes frañaos"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Instalaránse los siguientes paquetes extra:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Paquetes afalaos:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Paquetes encamentaos"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Saltando %s, nun ta instaláu y namái se requieren anovamientos.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s yá ta na versión más nueva.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Esbillada la versión %s (%s) pa %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Esbillada la versión %s (%s) pa %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1393,136 +1485,121 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Instaláu]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Instaláu]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Instaláu]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Instaláu]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes nun cumplen dependencies:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "pero %s ta instaláu"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "pero %s ta pa instalar"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "pero nun ye instalable"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "pero ye un paquete virtual"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "pero nun ta instaláu"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "pero nun va instalase"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " o"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes nun cumplen dependencies:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Van instalase los siguientes paquetes NUEVOS:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Los siguientes paquetes van DESANICIASE:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Los siguientes paquetes tan reteníos:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Los siguientes paquetes van actualizase:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Los siguientes paquetes van DESACTUALIZASE:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Van camudase los siguientes paquetes reteníos:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1530,27 +1607,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualizaos, %lu nuevos instalaos, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalaos, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizaos, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
@@ -1559,7 +1636,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[S/n]"
 
@@ -1567,36 +1644,28 @@ msgstr "[S/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1610,40 +1679,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avisu d'autenticación saltáu.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Dellos paquetes nun pudieron autenticase"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "¿Instalar esos paquetes ensin verificación?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Falló algamar %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1654,74 +1689,44 @@ msgstr "Nun pudo renomase %s como %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La orde update nun lleva argumentos"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Fecho"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Oxe "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Des:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Tresnando]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Cambeu de mediu: Por favor meti'l discu etiquetáu\n"
-" '%s'\n"
-"na unidá '%s' y calca Intro\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nun ye a lleer %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1798,36 +1803,431 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusionando información disponible"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Llamóse a DropNode nun nodu que ta entá enllazáu"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "¡Fallu al atopar l'elementu enllazáu!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nun ye a lleer %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Falló al allugar una desvíu"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nun se pue escribir en %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Fallu internu en AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "La llista d'estensión de paquetes ye enforma llarga"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Intentando sobrescribir un desvíu, %s -> %s and %s/%s"
+msgid "Error processing directory %s"
+msgstr "Error al procesar el direutoriu %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "La llista d'estensión de fontes ye enforma llarga"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Error al escribir la cabecera al ficheru de conteníos"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Doble suma de desvíu %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Error al procesar conteníos %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Nun concasó denguna seleición"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Ficheru de configuración duplicáu %s/%s"
+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:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "La BD corrompiose, ficheru renomáu como %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "La DB ye antigua, tentando actualizar %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Nun pudo lleese %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Nun pudo lleese l'enllaz %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "L'archivu nun tien rexistru de control"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "L'archivu nun tien el campu paquetes"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nun tien la entrada saltos\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  el curiador de %s ye %s y non %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nun tien la entrada saltos de fonte\n"
+
+#: ftparchive/writer.cc:710
+#, 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:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nun pudo renomase %s como %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1853,17 +2253,6 @@ msgstr "El paquete ta tentando escribir nel oxetivu desviáu %s/%s"
 msgid "The diversion path is too long"
 msgstr "La trayeutoria de desviación ye enforma llarga"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1892,30 +2281,36 @@ msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
 msgid "Unable to stat %s"
 msgstr "Nun ye a lleer %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Llamóse a DropNode nun nodu que ta entá enllazáu"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Falló al pesllar el ficheru %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "¡Fallu al atopar l'elementu enllazáu!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Falló al allugar una desvíu"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Fallu internu en AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Esti nun ye un ficheru DEB válidu, falta'l miembru '%s'"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Intentando sobrescribir un desvíu, %s -> %s and %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Error internu, nun se pue atopar el miembru %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Doble suma de desvíu %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ficheru de control inanalizable"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ficheru de configuración duplicáu %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1963,201 +2358,52 @@ msgstr "Falló la suma de control de tar, ficheru tollíu"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Testera  del TAR triba %u desconocida, miembru %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Executando dpkt"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i rexistros escritos.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i rexistros escritos con %i ficheros de menos.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
+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-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Error internu, nun se pue atopar el miembru %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Ficheru de control inanalizable"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "El hash nun concasa pa: %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/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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Caché de paquetes balera."
-
-#: 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: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:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "El ficheru de caché de paquetes ta tollíu"
+msgid "List directory %spartial is missing."
+msgstr "Falta'l direutoriu de llistes %spartial."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Depende de"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Predepende de"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Suxer"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Recomienda"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "En conflictu con"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Sustituye a"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Fai obsoletu a"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Ruempe"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Aumenta"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "importante"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "requeríu"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "estándar"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opcional"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Archives directory %spartial is missing."
+msgstr "Falta'l direutoriu d'archivos %spartial."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nun pudo alncontrase'l controlador de métodu %s."
+msgid "Unable to lock directory %s"
+msgstr "Nun pudo bloquiase'l direutoriu %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, 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:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El métodu %s nun entamó correchamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nun se pudo abrir el ficheru d'estáu %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Descargando ficheru %li de %li (falten %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del ficheru temporal d'estáu %s"
+msgid "Retrieving file %li of %li"
+msgstr "Descargando ficheru %li de %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2177,35 +2423,35 @@ msgstr "El tamañu nun concasa"
 msgid "Invalid file format"
 msgstr "Operación incorreuta: %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2215,12 +2461,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:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Fallu GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2229,12 +2475,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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2242,166 +2488,117 @@ msgstr ""
 "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
 "paquete %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "La caché tien un sistema de versiones incompatible"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Nun pudo alncontrase'l controlador de métodu %s."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Hebo un error al procesar %s (FindPkg)"
-
-#: 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: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: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: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."
+msgid "Is the package %s installed?"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "El métodu %s nun entamó correchamente"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %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/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/algorithms.cc:265
+#, 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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recoyendo ficheros qu'apurren"
+#: 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/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/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/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/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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "El bloque de fornidor %s nun contién una buelga dixital"
+#: 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"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Falta'l direutoriu de llistes %spartial."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Nun pudo lleese la llista de fontes."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Falta'l direutoriu d'archivos %spartial."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nun pudo bloquiase'l direutoriu %s"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Nun s'alcontró la versión '%s' pa '%s'"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Descargando ficheru %li de %li (falten %s)"
+msgid "Couldn't find task '%s'"
+msgstr "Nun pudo alcontrase la xera '%s'"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
 
-#: 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/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/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Nun pudo lleese %s."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
+"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
+"como non tien nengún d'ellos"
 
-#: apt-pkg/policy.cc:422
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 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"
+"Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente "
+"virtual"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 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:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nun pudo abrise'l ficheru '%s'"
+"Nun puede seleicionase versión candidata pal paquete %s que nun tien "
+"candidata"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"Nun puede seleicionase versión instalada pal paquete %s que nun ta instalada"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2485,54 +2682,88 @@ msgstr "Escribiendo llista nueva d'oríxenes\n"
 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/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Nun pudo lleese %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencies"
 
-#: 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: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 "Failed to open StateFile %s"
+msgstr "Nun se pudo abrir el ficheru d'estáu %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del ficheru temporal d'estáu %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "%i rexistros escritos.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i rexistros escritos con %i ficheros de menos.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"Escribiéronse %i rexistros con %i ficheros perdíos y %i ficheros que nun "
+"concasen\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "El hash nun concasa pa: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2559,6 +2790,217 @@ msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Executando dpkt"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nun pudo abrise'l ficheru '%s'"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Caché de paquetes balera."
+
+#: 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: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: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: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: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:321
+msgid "Depends"
+msgstr "Depende de"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Predepende de"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Suxer"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Recomienda"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "En conflictu con"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Sustituye a"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Fai obsoletu a"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Ruempe"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Aumenta"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "importante"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "requeríu"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "estándar"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcional"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Recoyendo ficheros qu'apurren"
+
+#: 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/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/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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2637,244 +3079,146 @@ msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
 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/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: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:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nun pudo alcontrase la xera '%s'"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
+msgid "Unable to parse package file %s (1)"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
-"como non tien nengún d'ellos"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente "
-"virtual"
+"Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los "
+"antiguos nel so llugar."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "El bloque de fornidor %s nun contién una buelga dixital"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Nun puede algamase información del puntu de montaxe %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "Instalando %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Nun se pudo montar el CD-ROM"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "Configurando %s"
+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/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Desinstalando %s"
+msgid "Command line option %s is not understood"
+msgstr "Nun s'entiende la opción %s de la llinia d'ordes"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "Desinstalóse dafechu %s"
+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/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Anotando desaniciáu de %s"
+msgid "Option %s requires an argument."
+msgstr "La opción %s necesita un argumentu."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Executando activador de post-instalación de %s"
+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>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Falta'l direutoriu '%s'."
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "La opción %s pide un argumentu enteru, non '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Nun pudo abrise'l ficheru '%s'"
+msgid "Option '%s' is too long"
+msgstr "Opción '%s' enforma llarga"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Preparando %s"
+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/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Desempaquetando %s"
+msgid "Invalid operation %s"
+msgstr "Operación incorreuta: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Preparándose pa configurar %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Triba d'abreviatura que nun se reconoz: «%c»"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "%s instaláu"
+msgid "Opening configuration file %s"
+msgstr "Abriendo ficheros de configuración %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Preparándose pa desinstalar %s"
+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/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "%s desinstaláu"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Fallu de sintaxis %s:%u: Marca mal formada"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Preparándose pa desinstalar dafechu %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempués del valor"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Desinstalóse dafechu %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemes de dependencies - déxase ensin configurar"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
-"discu llenu"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
-"memoria"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
-"discu llenu"
+"Error de sintaxis %s:%u: Les directives pueden facese sólo nel nivel cimeru"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Nun pudó bloquease'l direutoriu d'alministración (%s), ¿hai otru procesu "
-"usándolu?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equí"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, 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?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"dpkg interrumpióse, tienes qu'executar manualmente '%s' pa iguar el "
-"problema. "
+"Fallu de sintaxis %s:%u: Directiva llimpia requier un tres opciones como "
+"argumentos"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Non bloquiáu"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2989,54 +3333,11 @@ msgstr "Hai problemes desvenceyando'l ficheru %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Escoyeta %s que nun s'atopa"
+msgid "No keyring installed in %s."
+msgstr "L'aniellu de claves nun s'instaló en %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3093,524 +3394,234 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equí"
+msgid "%c%s... Error!"
+msgstr "%c%s... ¡Fallu!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada"
+msgid "%c%s... Done"
+msgstr "%c%s... Fecho"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Fecho"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "La opción %s necesita un argumentu."
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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>."
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "La opción %s pide un argumentu enteru, non '%s'"
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opción '%s' enforma llarga"
+msgid "%lis"
+msgstr "%lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, 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."
+msgid "Selection %s not found"
+msgstr "Escoyeta %s que nun s'atopa"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "La llista d'estensión de paquetes ye enforma llarga"
+"Nun pudó bloquease'l direutoriu d'alministración (%s), ¿hai otru procesu "
+"usándolu?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Error al procesar el direutoriu %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "La llista d'estensión de fontes ye enforma llarga"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Error al escribir la cabecera al ficheru de conteníos"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nun pudo bloquiase'l direutoriu d'alministración (%s), ¿yes root?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Error al procesar conteníos %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Nun concasó denguna seleición"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "La BD corrompiose, ficheru renomáu como %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "La DB ye antigua, tentando actualizar %s"
+"dpkg interrumpióse, tienes qu'executar manualmente '%s' pa iguar el "
+"problema. "
 
-#: ftparchive/cachedb.cc:94
-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."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non bloquiáu"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nun pudo lleese l'enllaz %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "L'archivu nun tien rexistru de control"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Nun pudo algamase un cursor"
+msgid "Installing %s"
+msgstr "Instalando %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Nun pudo lleese'l direutoriu %s\n"
+msgid "Configuring %s"
+msgstr "Configurando %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, 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 "
+msgid "Removing %s"
+msgstr "Desinstalando %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:98
 #, 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"
+msgid "Completely removing %s"
+msgstr "Desinstalóse dafechu %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "Nun pudo abrise %s"
+msgid "Noting disappearance of %s"
+msgstr "Anotando desaniciáu de %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Desenllazar %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "Executando activador de post-instalación de %s"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Nun pudo lleese l'enllaz %s"
+msgid "Directory '%s' missing"
+msgstr "Falta'l direutoriu '%s'."
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Nun pudo desenllazase %s"
+msgid "Could not open file '%s'"
+msgstr "Nun pudo abrise'l ficheru '%s'"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Falló enllazar enllazr %s a %s"
+msgid "Preparing %s"
+msgstr "Preparando %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "L'archivu nun tien el campu paquetes"
+msgid "Unpacking %s"
+msgstr "Desempaquetando %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nun tien la entrada saltos\n"
+msgid "Preparing to configure %s"
+msgstr "Preparándose pa configurar %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  el curiador de %s ye %s y non %s\n"
+msgid "Installed %s"
+msgstr "%s instaláu"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nun tien la entrada saltos de fonte\n"
+msgid "Preparing for removal of %s"
+msgstr "Preparándose pa desinstalar %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nun pudo allugase memoria"
+msgid "Removed %s"
+msgstr "%s desinstaláu"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "Preparándose pa desinstalar dafechu %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "Desinstalóse dafechu %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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'"
+msgid "Can not write log (%s)"
+msgstr "Nun se pue escribir en %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"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Nun pudo criase FICHERU*"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Nun pudo biforcase"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Comprimir fíu"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Error internu, nun pudo criase %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemes de dependencies - déxase ensin configurar"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Fallu na ES al soprocesu/ficheru"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que "
+"siguió dende un fallu previu"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Nun pudo lleese al computar MD5"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
+"discu llenu"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema al desenllazar %s"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
+"memoria"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 #, 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 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!"
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
+"discu llenu"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu E/S "
+"dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Error internu, AllUpgrade rompió coses"
 
 #~ 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 51e04bf90..ea7382513 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -100,75 +100,75 @@ msgstr "Общо отчетено про�тран�тво: "
 msgid "Package file %s is out of sync."
 msgstr "Пакетни�т файл %s не е �инхронизиран."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Тр�бва да въведете поне един шаблон за тър�ене"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Тази командата е о�тар�ла. Използвайте „apt-mark showauto“ вме�то не�."
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Пакетът %s не може да бъде намерен"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Пакетни файлове:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Отбити пакети:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(не �а намерени)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Ин�талирана: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(н�ма)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Отбиване на пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Таблица � вер�иите:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -328,7 +328,7 @@ msgid "Couldn't find package %s"
 msgstr "�еу�пех при намирането на пакет %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s е отбел�зан като ръчно ин�талиран.\n"
@@ -358,7 +358,7 @@ msgstr "�еу�пех при заключването на директори�
 msgid "Must specify at least one package to fetch source for"
 msgstr "Тр�бва да укажете поне един пакет за изтегл�не на изходни� му код"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "�еу�пех при намирането на изходен код на пакет %s"
@@ -391,7 +391,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропу�кане на вече изтеглени� файл „%s“\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "�еу�пех при определ�нето на �вободното про�тран�тво в %s"
@@ -424,7 +424,7 @@ msgstr "Изтегл�не на изходен код %s\n"
 msgid "Failed to fetch some archives."
 msgstr "�еу�пех при изтегл�нето на н�кои архиви."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Изтегл�нето завърши в режим �амо на изтегл�не"
 
@@ -434,31 +434,31 @@ msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропу�кане на разпакетирането на вече разпакетирани� изходен код в %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Командата за разпакетиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверете дали имате ин�талиран пакета „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Командата за компилиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Проце�ът-потомък пропадна"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Тр�бва да укажете поне един пакет за проверка на зави�имо�ти за компилиране"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -467,18 +467,18 @@ msgstr ""
 "Лип�ва информаци� за архитектурата %s. Прегледайте информаци�та за APT::"
 "Architectures в apt.conf(5)."
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "�еу�пех при получаването на информаци� за зави�имо�тите за компилиране на %s"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s н�ма зави�имо�ти за компилиране.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +487,7 @@ msgstr ""
 "Зави�имо�т %s за пакета %s не може да бъде удовлетворена, %s не �е позвол�ва "
 "за пакети „%s“"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +496,14 @@ msgstr ""
 "Зави�имо�т %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "не може да бъде намерен"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "�еу�пех при удовлетвор�ването на зави�имо�т %s за пакета %s: Ин�талирани�т "
 "пакет %s е твърде нов"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +512,7 @@ msgstr ""
 "Зави�имо�т %s за пакета %s не може да бъде удовлетворена, понеже вер�и�та "
 "кандидат на пакета %s не може да удовлетвори изи�кването за вер�и�"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,30 +521,30 @@ msgstr ""
 "Зави�имо�т %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "н�ма подход�щи вер�ии"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "�еу�пех при удовлетвор�ването на зави�имо�т %s за пакета %s: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зави�имо�тите за компилиране на %s не можаха да бъдат удовлетворени."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "�еу�пех при обработката на зави�имо�тите за компилиране"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Журнал на промените в %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -634,16 +634,20 @@ msgstr ""
 "информаци� и опции.\n"
 "                           Това APT има Върховни Сили.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "Тр�бва да укажете поне един пакет за изтегл�не на изходни� му код"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -652,6 +656,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -681,8 +686,9 @@ msgstr "Пакетът „%s“ вече е задуржан.\n"
 msgid "%s was already not hold.\n"
 msgstr "Пакетът „%s“ вече е задържан.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Изчака �е завършването на %s, но той не беше пу�нат"
@@ -898,7 +904,7 @@ msgstr ""
 "�еу�пех при �вързването на гнездо за данни, допу�тимото време за �вързване "
 "изтече"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "�еу�пех"
 
@@ -944,7 +950,7 @@ msgstr "Времето за у�танов�ване на връзка � гне
 msgid "Unable to accept connection"
 msgstr "�евъзможно е да �е приеме �вързването"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Проблем при хеширане на файла"
 
@@ -1078,112 +1084,204 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Празни файлове не могат да бъдат валидни архиви"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Грешка при запи�а на файла"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Грешка при четене от �ървъра. Отдалечени�т �ървър прекъ�на връзката"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Грешка при четене от �ървъра"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Грешка при запи�а на файл"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "�еу�пех на избора"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Допу�тимото време за �вързване изтече"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Грешка при запи�а на изходен файл"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Чакане на заглавни ча�ти"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "�евалиден ред на заглавна ча�т"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP �ървърът изпрати невалидна заглавна ча�т като отговор"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP �ървърът изпрати невалидна заглавна ча�т „Content-Length“"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP �ървърът изпрати невалидна заглавна ча�т „Content-Range“"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "HTTP �ървърът н�ма поддръжка за прехвърл�не на фрагменти на файлове"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "�еизве�тен формат на дата"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "�евалидни данни на заглавната ча�т"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "�еу�пех при �вързването"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Поп "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Изт:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Игн "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Грш "
+
+#: apt-private/acqprogress.cc:146
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Изтеглени %sB за %s (%sB/�ек)\n"
+
+#: apt-private/acqprogress.cc:236
+#, c-format
+msgid " [Working]"
+msgstr " [В проце� на работа]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"См�на на но�ител: �ложете ди�ка � етикет\n"
+" „%s“\n"
+"в у�трой�твото „%s“ и нати�нете „Enter“\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ПРЕДУПРЕЖДЕ�ИЕ: Следните пакети не могат да бъдат удо�товерени!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Предупреждението за удо�товер�ването е пренебрегнато.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "��кои пакети не можаха да бъдат удо�товерени"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Ин�талиране на тези пакети без проверка?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "�еу�пех при изтегл�нето на %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при �чупени пакети!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Тр�бва да бъдат премахнати пакети, но премахването е изключено."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Вътрешна грешка, „Ordering“ не завърши"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1192,31 +1290,27 @@ 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
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "След тази операци� ще бъде о�вободено %sB ди�ково про�тран�тво.\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "��мате до�татъчно �вободно про�тран�тво в %s."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Да, прави каквото казвам!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1227,19 +1321,19 @@ msgstr ""
 "За да продължите, въведете фразата „%s“\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Прекъ�ване."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "И�кате ли да продължите?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "��кои файлове не можаха да бъдат изтеглени"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1247,19 +1341,19 @@ msgstr ""
 "�еу�пех при изтегл�нето на н�кои архиви, може да изпълните „apt-get update“ "
 "или да опитате � „--fix-missing“?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "„--fix-missing“ и превключване на но�ители не �е поддържа в�е още"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "�еу�пех при коригирането на лип�ващите пакети."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Прекъ�ване на ин�талирането."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1273,15 +1367,15 @@ msgstr[1] ""
 "Следните пакети �а от�транени от �и�темата поради препокриване на в�ичките "
 "им файлове от други пакети:"
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Това �е прави автоматично от dpkg."
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "�е би тр�бвало да �е изтрива. AutoRemover н�ма да бъде �тартиран"
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1299,16 +1393,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Следната информаци� може да помогне за намиране на изход от �итуаци�та:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Вътрешна грешка, AutoRemover �чупи нещо в �и�темата"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1318,7 +1412,7 @@ msgstr[0] "Следни�т пакет е бил ин�талиран автом
 msgstr[1] ""
 "Следните пакети �а били ин�талирани автоматично и вече не �а необходими:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1327,7 +1421,7 @@ msgstr[0] "%lu пакет е бил ин�талиран автоматично
 msgstr[1] ""
 "%lu пакета �а били ин�талирани автоматично и вече не �а необходими:\n"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете."
@@ -1345,7 +1439,7 @@ msgstr ""
 "�еудовлетворени зави�имо�ти. Опитайте „apt-get -f install“ без пакети (или "
 "укажете разрешение)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1357,71 +1451,71 @@ msgstr ""
 "ди�трибуци�, че н�кои необходими пакети още не �а �ъздадени или пък\n"
 "�а били преме�тени от Incoming."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Счупени пакети"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Следните допълнителни пакети ще бъдат ин�талирани:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Предложени пакети:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Препоръчвани пакети:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Пропу�кане на %s, вече е ин�талиран и не е маркиран за актуализаци�.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Пропу�кане на %s, който не е ин�талиран при за�вени �амо обнов�вани�.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Преин�талаци�та на %s не е възможна, не може да бъде изтеглен.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s вече е най-новата вер�и�.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Избрана е вер�и� %s (%s) за %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Избрана е вер�и� „%s“ (%s) за „%s“ заради „%s“\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Пакетът „%s“ не е ин�талиран, така че не е премахнат. Може би имахте предвид "
 "„%s“?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакетът „%s“ не е ин�талиран, така че не е премахнат\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1429,138 +1523,120 @@ msgid_plural ""
 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."
+#: 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-get -f install“, за да коригирате тези "
-"неизправно�ти."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "�еудовлетворени зави�имо�ти. Опитайте � „-f“."
+"Забележка: това е �амо �имулаци�!\n"
+"           apt-get има нужда от админи�тративни права за да работи.\n"
+"           Заключването е деактивирано, така че не разчитайте\n"
+"           на повтар�емо�т в реална �итуаци�."
 
 #: apt-private/private-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Ин�талиран]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Ин�талиран]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Ин�талиран]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Ин�талиран]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Следните пакети имат неудовлетворени зави�имо�ти:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "но е ин�талиран %s"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "но ще бъде ин�талиран %s"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "но той не може да бъде ин�талиран"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "но той е виртуален пакет"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "но той не е ин�талиран"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "но той н�ма да бъде ин�талиран"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " или"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Следните пакети имат неудовлетворени зави�имо�ти:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Следните �ОВИ пакети ще бъдат ин�талирани:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Следните пакети ще бъдат ПРЕМ�Х��ТИ:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Следните пакети н�ма да бъдат променени:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Следните пакети ще бъдат актуализирани:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Следните пакети ще бъдат ВЪР��ТИ КЪМ ПО-СТ�Р� ВЕРСИЯ:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Следните задържани пакети ще бъдат променени:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (поради %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1568,27 +1644,27 @@ msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: Следните необходими пакети ще бъдат премахнати.\n"
 "Това �Е би тр�бвало да �тава о�вен ако знаете точно какво правите!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu актуализирани, %lu нови ин�талирани, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu преин�талирани, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu върнати към по-�тара вер�и�, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu за премахване и %lu без пром�на.\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu не �а напълно ин�талирани или премахнати.\n"
@@ -1597,7 +1673,7 @@ msgstr "%lu не Ñ�а напълно инÑ�талирани или премахÐ
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[Y/n]"
 
@@ -1605,36 +1681,28 @@ msgstr "[Y/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1648,39 +1716,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ПРЕДУПРЕЖДЕ�ИЕ: Следните пакети не могат да бъдат удо�товерени!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Предупреждението за удо�товер�ването е пренебрегнато.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "��кои пакети не можаха да бъдат удо�товерени"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Ин�талиране на тези пакети без проверка?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "�еу�пех при изтегл�нето на %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1691,74 +1726,44 @@ msgstr "�еу�пех при преименуването на %s на %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Командата „update“ не възприема аргументи"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Готово"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Поп "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Изт:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Игн "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Грш "
-
-#: apt-private/acqprogress.cc:146
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Изтеглени %sB за %s (%sB/�ек)\n"
-
-#: apt-private/acqprogress.cc:236
-#, c-format
-msgid " [Working]"
-msgstr " [В проце� на работа]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"См�на на но�ител: �ложете ди�ка � етикет\n"
-" „%s“\n"
-"в у�трой�твото „%s“ и нати�нете „Enter“\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "�еу�пех при четенето на %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1832,36 +1837,434 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Сме�ване на наличната информаци�"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Извикан е DropNode за в�е още използван възел"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Грешка при намирането на хеш-елемента!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "�еу�пех при получаването на атрибути за %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "�еу�пех при у�танов�ване на отклонението"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "�еу�пех при запи�а на %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Вътрешна грешка в AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "�е може да �е извлече вер�и�та на debconf. Debconf ин�талиран ли е?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Спи�ъкът � разширени� на пакети и твърде дълъг"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s"
+msgid "Error processing directory %s"
+msgstr "Грешка при обработката на директори� %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Спи�ъкът � разширени� на източници е твърде дълъг"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Грешка при запазването на заглавната ча�т във файла �ъ� �ъдържание"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Двойно добав�не на отклонение %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Грешка при обработката на �ъдържание %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "��ма �ъвпадени� на избора"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Дублиран конфигурационен файл %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Лип�ват н�кои файлове от групата � файлови пакети „%s“"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД е повредена, файлът е преименуван на %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "БД е �тара, опит за актуализиране на %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "�еу�пех при отвар�нето на файл %s от БД: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Грешка при получаването на атрибути за %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "�еу�пех при прочитането на връзка %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "В архива н�ма поле „control“"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "�рхивът н�ма поле „package“"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s н�ма запи� „override“\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  поддържащи� пакета %s е %s, а не %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s н�ма запи� „source override“\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s н�ма �ъщо и запи� „binary override“\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "�еу�пех при преименуването на %s на %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1887,17 +2290,6 @@ msgstr "Пакетът �е опитва да пише в целта за отк
 msgid "The diversion path is too long"
 msgstr "Път�т за отклонение е твърде дълъг"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1926,30 +2318,36 @@ msgstr "Файл %s/%s замен� този в пакет %s"
 msgid "Unable to stat %s"
 msgstr "�еу�пех при получаването на атрибути за %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Извикан е DropNode за в�е още използван възел"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "�еу�пех при затвар�нето на файл %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Грешка при намирането на хеш-елемента!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "�еу�пех при у�танов�ване на отклонението"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Вътрешна грешка в AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Това не е валиден DEB архив, лип�ва елемент „%s“"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Вътрешна грешка, неу�пех при намирането на �ъ�тавна ча�т %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Двойно добав�не на отклонение %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Контролен файл, невъзможен за анализ"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Дублиран конфигурационен файл %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1997,200 +2395,52 @@ msgstr "�ев�рна контролна �ума на tar, развален а
 msgid "Unknown TAR header type %u, member %s"
 msgstr "�епозната заглавна ча�т на TAR тип %u, елемент %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Изпълн�ване на dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Пакетната �и�тема „%s“ не е поддържана"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "�еу�пех при определ�нето на подход�ща пакетна �и�тема"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Запи�ани �а %i запи�а.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Запи�ани �а %i запи�а � %i лип�ващи файла.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Запи�ани �а %i запи�а � %i не�ъответ�тващи файла\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Това не е валиден DEB архив, лип�ва елемент „%s“"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Запи�ани �а %i запи�а � %i лип�ващи и %i не�ъответ�тващи файла\n"
+msgid "Internal error, could not locate member %s"
+msgstr "Вътрешна грешка, неу�пех при намирането на �ъ�тавна ча�т %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "�е е намерен oторизационен запи� за: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Контролен файл, невъзможен за анализ"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "�е�ъответ�твие на контролната �ума за: %s"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Спи�ъците � пакети или файлът за �ъ�то�ние не можаха да бъдат анализирани "
-"или отворени."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Може да и�кате да изпълните „apt-get update“, за да коригирате тези проблеми"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Спи�ъкът � източници не можа да бъде прочетен."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Празен кеш на пакети"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Файлът за кеш на пакети е повреден"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "Файлът за кеш на пакети е не�ъвме�тима вер�и�"
-
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Файлът за кеш на пакети е повреден, твърде малък е"
+msgid "List directory %spartial is missing."
+msgstr "Директори�та �ъ� �пи�ъци %spartial лип�ва."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Тази вер�и� на APT не поддържа �и�тема за вер�ии „%s“"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "Кешът на пакети е бил направен за различна архитектура"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Зави�и от"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Предварително зави�и от"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Предлага �е"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Препоръчва �е"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "В конфликт �"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Замен�"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Изважда от употреба"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Чупи"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Подобр�ва"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "важен"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "изи�кван"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "�тандартен"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "незадължителен"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "допълнителен"
+msgid "Archives directory %spartial is missing."
+msgstr "Директори�та за архиви %spartial лип�ва."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "�еу�пех при намирането на драйвер за метод %s."
+msgid "Unable to lock directory %s"
+msgstr "�еу�пех при заключване на директори�та %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверете дали имате ин�талиран пакета „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Методът %s не �тартира правилно"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Сложете ди�ка, озаглавен „%s“ в у�трой�тво „%s“ и нати�нете „Enter“."
-
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "�е �е поддържа индек�ен файл от типа „%s“"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "�еу�пех при отвар�нето на StateFile %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Изтегл�не на файл %li от %li (о�тават %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "�еу�пех при запи� на временен StateFile %s"
+msgid "Retrieving file %li of %li"
+msgstr "Изтегл�не на файл %li от %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2210,7 +2460,7 @@ msgstr "�е�ъответ�твие на размера"
 msgid "Invalid file format"
 msgstr "�евалидна операци� %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2219,16 +2469,16 @@ msgstr ""
 "�е може да �е открие елемент „%s“ във файла Release (объркан ред в sources."
 "list или повреден файл)"
 
-#: apt-pkg/acquire-item.cc:1597
+#: apt-pkg/acquire-item.cc:1589
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "�е е открита контролна �ума за „%s“  във файла Release"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "��ма налични публични ключове за �ледните идентификатори на ключове:\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2237,12 +2487,12 @@ msgstr ""
 "Файлът �ъ� �лужебна информаци� за „%s“ е о�тар�л (валиден до %s). ��ма да �е "
 "прилагат обнов�вани� от това хранилище."
 
-#: apt-pkg/acquire-item.cc:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфликт в ди�трибуци�та: %s (очаквана: %s, намерена: %s)"
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2252,12 +2502,12 @@ msgstr ""
 "използват �тарите индек�ни файлове. Грешка от GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Грешка от GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2266,183 +2516,133 @@ msgstr ""
 "�еу�пех при намирането на файл за пакет %s. Това може да означава, че тр�бва "
 "ръчно да оправите този пакет (поради пропу�ната архитектура)."
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "�е е открит източник, от който да �е изтегли вер�и� „%s“ на „%s“"
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Индек�ните файлове на пакета �а повредени. ��ма поле Filename: за пакет %s."
 
-#: 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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Възникна грешка при обработката на %s (%s%d)"
-
-#: 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:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Еха, надхвърлихте бро� вер�ии, на който е �по�обна тази вер�и� на APT."
+msgid "The method driver %s could not be found."
+msgstr "�еу�пех при намирането на драйвер за метод %s."
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте бро� опи�ани�, на който е �по�обна тази вер�и� на APT."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверете дали имате ин�талиран пакета „dpkg-dev“.\n"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте бро� зави�имо�ти, на който е �по�обна тази вер�и� на APT."
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Методът %s не �тартира правилно"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакетът %s %s не беше открит при обработката на файла �ъ� зави�имо�ти"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Сложете ди�ка, озаглавен „%s“ в у�трой�тво „%s“ и нати�нете „Enter“."
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"�еу�пех при получаването на атрибути на �пи�ъка � пакети � изходен код %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 "Четене на �пи�ъците � пакети"
+"Пакетът %s тр�бва да бъде преин�талиран, но не може да �е намери архив за "
+"него."
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Събиране на информаци� за „О�игур�ва“"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
+"причинено от задържани пакети."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "�еу�пех при запи�а на %s"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"�еу�пех при коригирането на проблемите, имате задържани �чупени пакети."
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Входно/изходна грешка при запазването на кеша на пакети � изходен код"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"Спи�ъците � пакети или файлът за �ъ�то�ние не можаха да бъдат анализирани "
+"или отворени."
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Блокът на производител� %s не �ъдържа отпечатък"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Може да и�кате да изпълните „apt-get update“, за да коригирате тези проблеми"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Директори�та �ъ� �пи�ъци %spartial лип�ва."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Спи�ъкът � източници не можа да бъде прочетен."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Директори�та за архиви %spartial лип�ва."
+msgid "Release '%s' for '%s' was not found"
+msgstr "�е е намерено издание „%s“ на „%s“"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "�еу�пех при заключване на директори�та %s"
+msgid "Version '%s' for '%s' was not found"
+msgstr "�е е намерена вер�и� „%s“ на „%s“"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Изтегл�не на файл %li от %li (о�тават %s)"
+msgid "Couldn't find task '%s'"
+msgstr "�еу�пех при намиране на задача „%s“"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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 ""
-"��кои индек�ни файлове не можаха да бъдат изтеглени. Те �а пренебрегнати или "
-"�а използвани по-�тари."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "�е �а намерен пакети, отговар�щ на регул�рни� израз „%s“"
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Тр�бва да добавите адре�и-URI от тип „source“ в sources.list"
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "�е �а намерен пакети, отговар�щ на регул�рни� израз „%s“"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "�еу�пех при получаването на атрибути на %s."
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "�е е възможно избиране на вер�и� за пакета „%s“ понеже е виртуален"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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 "��ма указан приоритет (или е нула) на отбиването"
+"�е е възможно избиране на ин�талирана или кандидат вер�и� за пакета „%s“ "
+"понеже той н�ма нито едната"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"�еу�пех при незабавната на�тройка на „%s“. За повече информаци� вижте "
-"информаци�та за APT::Immediate-Configure в „man 5 apt.conf“. (%d)"
+"�е е възможно избиране на на по�ледната вер�и� за пакета „%s“, защото е "
+"виртуален"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "�еу�пех при конфигуриране на „%s“. "
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"�е е възможно избиране на кандидат-вер�и� за пакета „%s“, защото н�ма "
+"подход�щ кандидати"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"В �лед�твие на циклични зави�имо�ти от типа „В конфликт �/Предварително "
-"зави�и от“, за да �е продължи ин�талаци�та тр�бва да �е премахне необходими� "
-"пакет %s. Това че�то е лошо, но ако наи�тина и�кате да го направите, "
-"активирайте опци�та APT::Force-LoopBreak."
+"�е е възможно избиране на ин�талирана вер�и� на пакета „%s“, защото не е "
+"ин�талиран"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2526,58 +2726,88 @@ msgstr "Запазване на нови� �пи�ък � източници\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Запи�ите в �пи�ъка � източници за този ди�к �а:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Пакетът %s тр�бва да бъде преин�талиран, но не може да �е намери архив за "
-"него."
+msgid "Unable to stat %s."
+msgstr "�еу�пех при получаването на атрибути на %s."
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
-"причинено от задържани пакети."
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Изграждане на дървото �ъ� зави�имо�ти"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-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 "Failed to open StateFile %s"
+msgstr "�еу�пех при отвар�нето на StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "�еу�пех при запи� на временен StateFile %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Изпращане на �ценарий към програмата за удовлетвор�ване на зави�имо�ти"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Изпращане на за�вка към програмата за удовлетвор�ване на зави�имо�ти"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Подготовка за приемане на решение"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 "Външната програма за удовлетвор�ване на зави�имо�ти �е провали без да изведе "
 "�ъобщение за грешка"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Изпълн�ване на външна програма за удовлетвор�ване на зави�имо�ти"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "�еу�пех при анализирането на пакетен файл %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Запи�ани �а %i запи�а.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "�еу�пех при анализирането на пакетен файл %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Запи�ани �а %i запи�а � %i лип�ващи файла.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Запи�ани �а %i запи�а � %i не�ъответ�тващи файла\n"
+
+#: 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 "Запи�ани �а %i запи�а � %i лип�ващи и %i не�ъответ�тващи файла\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "�е е намерен oторизационен запи� за: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "�е�ъответ�твие на контролната �ума за: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2604,6 +2834,222 @@ msgstr "�еправилна �тойно�т за „Valid-Until“ във фа
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "�еправилна �тойно�т за „Date“ във файла Release %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Пакетната �и�тема „%s“ не е поддържана"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "�еу�пех при определ�нето на подход�ща пакетна �и�тема"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Изпълн�ване на dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "�еу�пех при конфигуриране на „%s“. "
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Празен кеш на пакети"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Файлът за кеш на пакети е повреден"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "Файлът за кеш на пакети е не�ъвме�тима вер�и�"
+
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Файлът за кеш на пакети е повреден, твърде малък е"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Тази вер�и� на APT не поддържа �и�тема за вер�ии „%s“"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "Кешът на пакети е бил направен за различна архитектура"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Зави�и от"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Предварително зави�и от"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Предлага �е"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Препоръчва �е"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "В конфликт �"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Замен�"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Изважда от употреба"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Чупи"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Подобр�ва"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "важен"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "изи�кван"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "�тандартен"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "незадължителен"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "допълнителен"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте бро� имена на пакети, на който е �по�обна тази вер�и� на "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Еха, надхвърлихте бро� вер�ии, на който е �по�обна тази вер�и� на APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте бро� опи�ани�, на който е �по�обна тази вер�и� на APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте бро� зави�имо�ти, на който е �по�обна тази вер�и� на APT."
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+"�еу�пех при получаването на атрибути на �пи�ъка � пакети � изходен код %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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Входно/изходна грешка при запазването на кеша на пакети � изходен код"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "�е �е поддържа индек�ен файл от типа „%s“"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2686,247 +3132,145 @@ msgstr "Типът „%s“ на ред %u в �пи�ъка � източниц
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Типът „%s“ на ред %u в �пи�ъка � източници %s е неизве�тен."
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "�е е намерено издание „%s“ на „%s“"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "�е е намерена вер�и� „%s“ на „%s“"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "�еу�пех при намиране на задача „%s“"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Тр�бва да добавите адре�и-URI от тип „source“ в sources.list"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "�е �а намерен пакети, отговар�щ на регул�рни� израз „%s“"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "�е �а намерен пакети, отговар�щ на регул�рни� израз „%s“"
+msgid "Unable to parse package file %s (1)"
+msgstr "�еу�пех при анализирането на пакетен файл %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "�е е възможно избиране на вер�и� за пакета „%s“ понеже е виртуален"
+msgid "Unable to parse package file %s (2)"
+msgstr "�еу�пех при анализирането на пакетен файл %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"�е е възможно избиране на ин�талирана или кандидат вер�и� за пакета „%s“ "
-"понеже той н�ма нито едната"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"�е е възможно избиране на на по�ледната вер�и� за пакета „%s“, защото е "
-"виртуален"
+"��кои индек�ни файлове не можаха да бъдат изтеглени. Те �а пренебрегнати или "
+"�а използвани по-�тари."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"�е е възможно избиране на кандидат-вер�и� за пакета „%s“, защото н�ма "
-"подход�щ кандидати"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Блокът на производител� %s не �ъдържа отпечатък"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"�е е възможно избиране на ин�талирана вер�и� на пакета „%s“, защото не е "
-"ин�талиран"
+msgid "Unable to stat the mount point %s"
+msgstr "�еу�пех при намирането на атрибутите на точка за монтиране %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "Ин�талиране на %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "�еу�пех при намирането на атрибутите на cdrom"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "Конфигуриране на %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "�еизве�тна опци� за команден ред „%c“ [от %s]."
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Премахване на %s"
+msgid "Command line option %s is not understood"
+msgstr "Опци�та за команден ред %s не е разпозната"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "Окончателно премахване на %s"
+msgid "Command line option %s is not boolean"
+msgstr "Опци�та за команден ред %s не е булева"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Отбел�зване на изчезването на %s"
+msgid "Option %s requires an argument."
+msgstr "Опци� %s изи�ква аргумент."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Изпълнение на тригер �лед ин�талиране %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Опци� %s: Значението тр�бва да има =<val>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Директори�та „%s“ лип�ва"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Опци� %s изи�ква аргумент ц�ло чи�ло, не „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "�еу�пех при отвар�не на файла „%s“"
+msgid "Option '%s' is too long"
+msgstr "Опци� „%s“ е твърде дълга"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Подготв�не на %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Сми�ълът %s не е ��ен, опитайте true или false."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Разпакетиране на %s"
+msgid "Invalid operation %s"
+msgstr "�евалидна операци� %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Подготв�не на %s за конфигуриране"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "�еизве�тен тип на абревиатура: „%c“"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "%s е ин�талиран"
+msgid "Opening configuration file %s"
+msgstr "Отвар�не на конфигурационен файл %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Подготв�не за премахване на %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Синтактична грешка %s:%u: В началото на блока н�ма име."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "%s е премахнат"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Подготовка за пълно премахване на %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Синтактична грешка %s:%u: Излишни �имволи �лед �тойно�тта"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s е напълно премахнат"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "Операци�та е прекъ�ната"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "отлагане на на�тройката поради неудовлетворени зави�имо�ти"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Доклад за зави�имо�тите не е запи�ан защото �ъобщението за грешка е породено "
-"от друга грешка."
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Доклад за зави�имо�тите не е запи�ан защото грешката е причинена от "
-"недо�татъчно ди�ково про�тран�тво"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Доклад за зави�имо�тите не е запи�ан защото грешката е причинена от "
-"недо�татъчна оперативна памет"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Доклад за зави�имо�тите не е запи�ан защото грешката е причинена от "
-"недо�татъчно ди�ково про�тран�тво"
+"Синтактична грешка %s:%u: Директиви могат да �е задават �амо в най-горното "
+"ниво"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Доклад за зави�имо�тите не е запи�ан поради входно-изходна грешка � dpkg"
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"�еу�пех при заключване на админи�тративната директори� (%s). Може би �е "
-"използва от друг проце�?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"�еу�пех при заключване на админи�тративната директори� (%s). Може би лип�ват "
-"админи�тративни права?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Синтактична грешка %s:%u: �еподдържана директива „%s“"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"Проце�ът dpkg е беше прекъ�нат. Проблемът тр�бва да �е коригира чрез ръчно "
-"изпълнение на „%s“."
+"Синтактична грешка %s:%u: директивата clear изи�ква  аргумент дърво от опции"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Без заключване"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Синтактична грешка %s:%u: Излишни �имволи в кра� на файла"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3045,54 +3389,11 @@ msgstr "Проблем при изтриване на файла %s"
 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... Готово"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Изборът %s не е намерен"
+msgid "No keyring installed in %s."
+msgstr "В %s н�ма ин�талиран ключодържател."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3150,527 +3451,237 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
+msgid "%c%s... Error!"
+msgstr "%c%s... Грешка!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Синтактична грешка %s:%u: �еподдържана директива „%s“"
+msgid "%c%s... Done"
+msgstr "%c%s... Готово"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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 не е булева"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Готово"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Опци� %s изи�ква аргумент."
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liч %liм %li�"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Опци� %s: Значението тр�бва да има =<val>."
+msgid "%lih %limin %lis"
+msgstr "%liч %liм %li�"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Опци� %s изи�ква аргумент ц�ло чи�ло, не „%s“"
+msgid "%limin %lis"
+msgstr "%liм %li�"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Опци� „%s“ е твърде дълга"
+msgid "%lis"
+msgstr "%li�"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Сми�ълът %s не е ��ен, опитайте true или false."
+msgid "Selection %s not found"
+msgstr "Изборът %s не е намерен"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Спи�ъкът � разширени� на пакети и твърде дълъг"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Грешка при обработката на директори� %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Спи�ъкът � разширени� на източници е твърде дълъг"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Грешка при запазването на заглавната ча�т във файла �ъ� �ъдържание"
+"�еу�пех при заключване на админи�тративната директори� (%s). Може би �е "
+"използва от друг проце�?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Грешка при обработката на �ъдържание %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-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 "Unable to lock the administration directory (%s), are you root?"
 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:841
-msgid "No selections matched"
-msgstr "��ма �ъвпадени� на избора"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Лип�ват н�кои файлове от групата � файлови пакети „%s“"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД е повредена, файлът е преименуван на %s.old"
+"�еу�пех при заключване на админи�тративната директори� (%s). Може би лип�ват "
+"админи�тративни права?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "БД е �тара, опит за актуализиране на %s"
-
-#: ftparchive/cachedb.cc:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"�евалиден формат на БД.  �ко �те обновили от по-�тара вер�и� на apt, "
-"премахнете базата от данни и � �ъздайте наново."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "�еу�пех при отвар�нето на файл %s от БД: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "�еу�пех при прочитането на връзка %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "В архива н�ма поле „control“"
-
-#: ftparchive/cachedb.cc:594
-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"
+"Проце�ът dpkg е беше прекъ�нат. Проблемът тр�бва да �е коригира чрез ръчно "
+"изпълнение на „%s“."
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "�еу�пех при обхода на дървото"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Без заключване"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "�еу�пех при отвар�нето на %s"
+msgid "Installing %s"
+msgstr "Ин�талиране на %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "DeLink %s [%s]\n"
+msgid "Configuring %s"
+msgstr "Конфигуриране на %s"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "�еу�пех при прочитането на връзка %s"
+msgid "Removing %s"
+msgstr "Премахване на %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "�еу�пех при премахването на връзка %s"
+msgid "Completely removing %s"
+msgstr "Окончателно премахване на %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** �еу�пех при �ъздаването на връзка %s към %s"
+msgid "Noting disappearance of %s"
+msgstr "Отбел�зване на изчезването на %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "Превишен лимит на DeLink от %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "�рхивът н�ма поле „package“"
+msgid "Running post-installation trigger %s"
+msgstr "Изпълнение на тригер �лед ин�талиране %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s н�ма запи� „override“\n"
+msgid "Directory '%s' missing"
+msgstr "Директори�та „%s“ лип�ва"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  поддържащи� пакета %s е %s, а не %s\n"
+msgid "Could not open file '%s'"
+msgstr "�еу�пех при отвар�не на файла „%s“"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s н�ма запи� „source override“\n"
+msgid "Preparing %s"
+msgstr "Подготв�не на %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s н�ма �ъщо и запи� „binary override“\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - �еу�пех при задел�нето на памет"
+msgid "Unpacking %s"
+msgstr "Разпакетиране на %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, 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"
+msgid "Preparing to configure %s"
+msgstr "Подготв�не на %s за конфигуриране"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "�еу�пех при четенето на override файл %s"
+msgid "Installed %s"
+msgstr "%s е ин�талиран"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "�еправилно форматиран override %s, ред %llu #1"
+msgid "Preparing for removal of %s"
+msgstr "Подготв�не за премахване на %s"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "�еправилно форматиран override %s, ред %llu #2"
+msgid "Removed %s"
+msgstr "%s е премахнат"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "�еправилно форматиран override %s, ред %llu #3"
+msgid "Preparing to completely remove %s"
+msgstr "Подготовка за пълно премахване на %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "�епознат алгоритъм за компре�и� „%s“"
+msgid "Completely removed %s"
+msgstr "%s е напълно премахнат"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Компре�ирани�т изход %s изи�ква на�тройка за компре�ирането"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "�еу�пех при запи�а на %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "�еу�пех при �ъздаването на FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "�еу�пех при пу�кането на подпроце�"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Проце�-потомък за компре�иране"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "Операци�та е прекъ�ната"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Вътрешна грешка, неу�пех при �ъздаването на %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Поради до�тигане на мак�имални� брой доклади (MaxReports) не е запи�ан нов "
+"доклад за зави�имо�тите."
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "В/И към подпроце�а/файла пропадна"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "отлагане на на�тройката поради неудовлетворени зави�имо�ти"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "�еу�пех при четене докато �е изчи�л�ва MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Доклад за зави�имо�тите не е запи�ан защото �ъобщението за грешка е породено "
+"от друга грешка."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "�еу�пех при премахването на връзка на %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Доклад за зави�имо�тите не е запи�ан защото грешката е причинена от "
+"недо�татъчно ди�ково про�тран�тво"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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 "�епознат запи� за пакет!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Доклад за зави�имо�тите не е запи�ан защото грешката е причинена от "
+"недо�татъчно ди�ково про�тран�тво"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Доклад за зави�имо�тите не е запи�ан поради входно-изходна грешка � dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Вътрешна грешка, „AllUpgrade“ �чупи нещо в �и�темата"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s не е валиден DEB пакет."
diff --git a/po/bs.po b/po/bs.po
index 6bfecf6ed..3cf69f0b1 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -14,6 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: cmdline/apt-cache.cc:149
 #, c-format
@@ -97,74 +99,74 @@ msgstr ""
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaći paket %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -289,7 +291,7 @@ msgid "Couldn't find package %s"
 msgstr ""
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
@@ -317,7 +319,7 @@ msgstr ""
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
@@ -343,7 +345,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
@@ -376,7 +378,7 @@ msgstr ""
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr ""
 
@@ -385,103 +387,103 @@ msgstr ""
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, 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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -527,15 +529,19 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -544,6 +550,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -573,8 +580,9 @@ msgstr ""
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -767,7 +775,7 @@ msgstr ""
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Neuspješno"
 
@@ -813,7 +821,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr ""
 
@@ -942,142 +950,226 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "ÄŒekam na zaglavlja"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr ""
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr ""
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr ""
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr ""
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr ""
+
+#: apt-private/acqprogress.cc:146
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
+
+#: apt-private/acqprogress.cc:236
+#, c-format
+msgid " [Working]"
+msgstr ""
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Ispravljam zavisnosti..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ne mogu ispraviti zavisnosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Urađeno"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
+
+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Slijedeći paketi će biti nadograđeni:"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr ""
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\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
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1085,37 +1177,37 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Odustani."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Da li želite nastaviti?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr ""
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1125,15 +1217,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1149,15 +1241,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1167,7 +1259,7 @@ msgid_plural ""
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1175,7 +1267,7 @@ msgid_plural ""
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
@@ -1191,7 +1283,7 @@ msgid ""
 "solution)."
 msgstr ""
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1199,68 +1291,68 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Preporu�eni paketi:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1268,163 +1360,143 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Ispravljam zavisnosti..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ne mogu ispraviti zavisnosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Urađeno"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: 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-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-
 #: apt-private/private-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr "[Instalirano]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr "[Instalirano]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr "[Instalirano]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr "[Instalirano]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "ali je %s instaliran"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ali se %s treba instalirati"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ali se ne može instalirati"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "ali je virtuelni paket"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "ali nije instaliran"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "ali se neće instalirati"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " ili"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Slijedeći paketi će biti UKLONJENI:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Slijedeći paketi su zadržani:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
@@ -1433,7 +1505,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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1441,37 +1513,29 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
 #: apt-private/private-show.cc:156
 #, c-format
 msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1484,36 +1548,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "Slijedeći paketi će biti nadograđeni:"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr ""
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr ""
-
-#: apt-private/private-download.cc:91 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? "
@@ -1524,70 +1558,44 @@ msgstr "Ne mogu otvoriti %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
 msgid "Calculating upgrade... "
 msgstr "Ra�unam nadogradnju..."
 
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr ""
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Urađeno"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr ""
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr ""
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr ""
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr ""
-
-#: apt-private/acqprogress.cc:146
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: apt-private/acqprogress.cc:236
-#, c-format
-msgid " [Working]"
-msgstr ""
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu �itati %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1659,364 +1667,533 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sastavljam dostupne informacije"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: 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-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ne mogu kreirati %s"
+
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ne mogu zapisati na %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-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#, c-format
+msgid "Error processing directory %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Error processing contents %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Double add of diversion %s -> %s"
+msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/cachedb.cc:65
 #, c-format
-msgid "Duplicate conf file %s/%s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je stara, pokušavam nadogradnju %s"
+
+#: ftparchive/cachedb.cc:94
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/cachedb.cc:99
+#, fuzzy, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
-msgid "The path %s is too long"
+msgid "Failed to stat %s"
 msgstr ""
 
-#: apt-inst/extract.cc:132
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Ne mogu ukloniti %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arhiva nema kontrolnog zapisa"
+
+#: ftparchive/cachedb.cc:594
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Unpacking %s more than once"
+msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:142
+#: ftparchive/writer.cc:96
 #, c-format
-msgid "The directory %s is diverted"
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:152
+#: 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 "The package is trying to write to the diversion target %s/%s"
+msgid "Failed to resolve %s"
 msgstr ""
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
 msgstr ""
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/writer.cc:219
 #, c-format
-msgid "Failed to stat %s"
+msgid "Failed to open %s"
+msgstr "Ne mogu otvoriti %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/writer.cc:286
 #, c-format
-msgid "Failed to rename %s to %s"
+msgid "Failed to readlink %s"
 msgstr ""
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:290
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid "Failed to unlink %s"
 msgstr ""
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Putanja je preduga"
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr ""
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:417
+msgid "Archive had no package field"
+msgstr ""
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
 #, c-format
-msgid "Overwrite package match with no version for %s"
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:706
 #, c-format
-msgid "Unable to stat %s"
+msgid "  %s has no source override entry\n"
 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/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr ""
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
 #, c-format
-msgid "Failed to close file %s"
+msgid "Unable to open %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
-msgid "Internal error, could not locate member %s"
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:73
 #, c-format
-msgid "Invalid archive member header %s"
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arhiva je prekratka"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr ""
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Ne mogu izvršiti gzip"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Oštećena arhiva"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:359
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
+msgid "Problem unlinking %s"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:57
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
+#: cmdline/apt-internal-solver.cc:49
+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-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr ""
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Nepoznat zapis paketa\""
 
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
+#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: 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"
+
+#: apt-inst/dirstream.cc:105
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "Failed to close file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "The path %s is too long"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr ""
+
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "Hash mismatch for: %s"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Putanja je preduga"
+
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
+#: apt-inst/extract.cc:438
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
+#: apt-inst/extract.cc:498
+#, c-format
+msgid "Unable to stat %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:174
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Zavisi"
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Unaprijed zavisi"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Predlaže"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Preporu�uje"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
-#, fuzzy
-msgid "Conflicts"
-msgstr "Sukobljava se sa"
+#: apt-inst/contrib/arfile.cc:96
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Zamjenjuje"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Zastarijeva"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arhiva je prekratka"
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "važno"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "zahtijevano"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standardno"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Ne mogu izvršiti gzip"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opcionalno"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Oštećena arhiva"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "The method driver %s could not be found."
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Is the package %s installed?"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradim stablo zavisnosti"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Verzije kandidata"
+#: apt-pkg/acquire.cc:91
+#, c-format
+msgid "Archives directory %spartial is missing."
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Stvaranje zavisnosti"
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ne mogu kreirati %s"
 
-#: 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/acquire.cc:490 apt-pkg/clean.cc:39
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Ne mogu otvoriti %s"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu ukloniti %s"
+msgid "Retrieving file %li of %li"
+msgstr "ÄŒitam spisak datoteke"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2035,35 +2212,35 @@ msgstr ""
 msgid "Invalid file format"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2071,178 +2248,127 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: 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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 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/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ne mogu zapisati na %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "List directory %spartial is missing."
+msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Archives directory %spartial is missing."
+msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ne mogu kreirati %s"
+msgid "Couldn't find task '%s'"
+msgstr "Ne mogu otvoriti %s"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "ÄŒitam spisak datoteke"
-
-#: 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 ""
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, 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"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Did not understand pin type %s"
-msgstr ""
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
@@ -2324,50 +2450,86 @@ msgstr ""
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Verzije kandidata"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Stvaranje zavisnosti"
+
+#: 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:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:78
@@ -2395,6 +2557,210 @@ msgstr ""
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr ""
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Zavisi"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Unaprijed zavisi"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Predlaže"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Preporu�uje"
+
+#: apt-pkg/pkgcache.cc:322
+#, fuzzy
+msgid "Conflicts"
+msgstr "Sukobljava se sa"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Zamjenjuje"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Zastarijeva"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "važno"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "zahtijevano"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standardno"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcionalno"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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 ""
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %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/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr ""
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr ""
+
 #: apt-pkg/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2470,220 +2836,139 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: 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"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
 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
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
+msgid "Unable to parse package file %s (1)"
 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
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "  Instalirano:"
-
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
-#, fuzzy, c-format
-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/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "Command line option %s is not understood"
 msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Directory '%s' missing"
+msgid "Command line option %s is not boolean"
 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/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/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Preparing to configure %s"
+msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:997
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr "  Instalirano:"
-
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Preparing for removal of %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Preporu�uje"
-
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: 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?"
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:190
@@ -2799,54 +3084,11 @@ msgstr ""
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Error!"
-msgstr ""
-
-#: apt-pkg/contrib/progress.cc:150
-#, c-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
-#, c-format
-msgid "%c%s... %u%%"
-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 ""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Odustajem od instalacije."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -2901,446 +3143,214 @@ 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 ""
-
-#: 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 ""
-
-#: apt-pkg/contrib/configuration.cc:633
-#, c-format
-msgid "Opening configuration file %s"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:801
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:820
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:837
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:897
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:950
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+msgid "%c%s... Error!"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Odustajem od instalacije."
-
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
+msgid "%c%s... Done"
 msgstr ""
 
-#: 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"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:168
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid "%c%s... %u%%"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
+msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Invalid operation %s"
-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: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?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
+msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:626
 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:841
-msgid "No selections matched"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: ftparchive/cachedb.cc:65
-#, 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:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je stara, pokušavam nadogradnju %s"
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Instalirano:"
 
-#: ftparchive/cachedb.cc:94
-msgid ""
-"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:96 apt-pkg/deb/dpkgpm.cc:999
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Povezujem se sa %s"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, fuzzy, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
+msgid "Removing %s"
+msgstr "Otvaram %s"
 
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arhiva nema kontrolnog zapisa"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr ""
-
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "W: Unable to read directory %s\n"
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr ""
-
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr ""
-
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to resolve %s"
-msgstr ""
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
+msgid "Directory '%s' missing"
 msgstr ""
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: ftparchive/writer.cc:278
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr ""
-
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:298
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr ""
-
-#: ftparchive/writer.cc:308
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr ""
-
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:706
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:710
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:992
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Otvaram %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:993
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Otvaram %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "Unable to open %s"
+msgid "Preparing to configure %s"
 msgstr ""
 
-#. 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:1000
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "  Instalirano:"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "Preparing for removal of %s"
 msgstr ""
 
-#: ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Preporu�uje"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #2"
+msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:1013
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Ne mogu ukloniti %s"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Ne mogu zapisati na %s"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
 msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
 msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nepoznat zapis paketa\""
-
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
 #~ msgid "%s not a valid DEB package."
diff --git a/po/ca.po b/po/ca.po
index 1774ace37..31961ecac 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -97,76 +97,76 @@ msgstr "Nombre total de l'espai atribuït a: "
 msgid "Package file %s is out of sync."
 msgstr "El fitxer %s del paquet està desincronitzat."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 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:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 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:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Fitxers de paquets:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Paquets etiquetats:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(no trobat)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Instaŀlat: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Candidat: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(cap)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Etiqueta del paquet: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Taula de versió:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -328,7 +328,7 @@ msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "S'ha marcat %s com instaŀlat manualment.\n"
@@ -359,7 +359,7 @@ msgstr "No és possible blocar el directori de descàrrega"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No es pot trobar un paquet de fonts per a %s"
@@ -392,7 +392,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'està ometent el fitxer ja baixat «%s»\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No s'ha pogut determinar l'espai lliure en %s"
@@ -425,7 +425,7 @@ msgstr "Obtén el font %s\n"
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Baixada completa i en mode de només baixada"
 
@@ -435,32 +435,32 @@ 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -469,18 +469,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:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no té dependències de construcció.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -489,7 +489,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:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -498,14 +498,14 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet "
 "%s"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -514,7 +514,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -523,30 +523,30 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió "
 "candidata"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Registre de canvis per a %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -638,16 +638,20 @@ msgstr ""
 "per a obtenir més informació i opcions.\n"
 "                       Aquest APT té superpoders bovins.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -656,6 +660,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -685,8 +690,9 @@ msgstr "%s ja estava retingut.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s ja estava no retingut.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperava %s però no hi era"
@@ -880,7 +886,7 @@ msgstr "No s'ha pogut crear un sòcol"
 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Ha fallat"
 
@@ -927,7 +933,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexió"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
@@ -1061,116 +1067,206 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Els fitxers buits no poden ser arxius vàlids"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Ha fallat la selecció"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Connexió finalitzada"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "S'ha produït un error en escriure al fitxer de sortida"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "S'estan esperant les capçaleres"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Línia de capçalera incorrecta"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 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:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Aquest servidor HTTP té el suport d'abast trencat"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Format de la data desconegut"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Error intern"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Obj "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Bai:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Treballant]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Canvi de medi: inseriu el disc amb l'etiqueta\n"
+" «%s»\n"
+"en la unitat «%s» i premeu Intro\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AV�S: No es poden autenticar els següents paquets!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "S'ha descartat l'avís d'autenticació.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "No s'ha pogut autenticar alguns paquets"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Voleu instaŀlar aquests paquets sense verificar-los?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 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:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 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:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1178,31 +1274,27 @@ 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
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Sí, fes el que et dic!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1213,19 +1305,19 @@ msgstr ""
 "Per continuar escriviu la frase «%s»\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Avortat."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Voleu continuar?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1233,19 +1325,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:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "No es poden corregir els paquets que falten."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "S'està avortant la instaŀlació."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1259,17 +1351,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1287,15 +1379,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 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:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1306,7 +1398,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:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1316,7 +1408,7 @@ 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:518
+#: apt-private/private-install.cc:519
 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."
@@ -1334,7 +1426,7 @@ msgstr ""
 "Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o "
 "especifiqueu una solució)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1346,72 +1438,72 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "S'instaŀlaran els següents paquets extres:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "S'està ometent %s, ja està instaŀlat i l'actualització no està establerta.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "S'està ometent '%s', no està instaŀlat i només es demana l'actualització.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ja es troba en la versió més recent.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versió seleccionada «%s» (%s) per a «%s»\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versió seleccionada «%s» (%s) per a «%s» degut a «%s»\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "El paquet «%s» no està instaŀlat, així doncs no es suprimirà. Volíeu dir "
 "«%s»?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1419,136 +1511,120 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Instaŀlat]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Instaŀlat]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Instaŀlat]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Instaŀlat]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Els següents paquets tenen dependències sense satisfer:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "però està instaŀlat %s"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "però s'instaŀlarà %s"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "però no és instaŀlable"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "però és un paquet virtual"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "però no està instaŀlat"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "però no serà instaŀlat"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " o"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Els següents paquets tenen dependències sense satisfer:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "S'instaŀlaran els paquets NOUS següents:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Es SUPRIMIRAN els paquets següents:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "S'han mantingut els paquets següents:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "S'actualitzaran els paquets següents:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Es DESACTUALITZARAN els paquets següents:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Es canviaran els paquets retinguts següents:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (per %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1556,27 +1632,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualitzats, %lu nous a instaŀlar, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstaŀlats, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualitzats, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu no instaŀlats o suprimits completament.\n"
@@ -1585,7 +1661,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[S/n]"
 
@@ -1593,36 +1669,28 @@ msgstr "[S/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1636,39 +1704,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AV�S: No es poden autenticar els següents paquets!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "S'ha descartat l'avís d'autenticació.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "No s'ha pogut autenticar alguns paquets"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Voleu instaŀlar aquests paquets sense verificar-los?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1679,74 +1714,44 @@ msgstr "No s'ha pogut canviar el nom de %s a %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "L'ordre update no pren arguments"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Fet"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Obj "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Bai:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Treballant]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Canvi de medi: inseriu el disc amb l'etiqueta\n"
-" «%s»\n"
-"en la unitat «%s» i premeu Intro\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "No es pot llegir %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1823,36 +1828,428 @@ msgstr ""
 msgid "Merging available information"
 msgstr "S'està fusionant la informació disponible"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode crida a un node que encara està enllaçat"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "No s'ha trobat l'element diseminat!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "No es pot veure l'estat de %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "No s'ha pogut assignar la desviació"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "No es pot escriure en %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "S'ha produït un error intern en AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "La llista de les extensions dels paquets és massa llarga"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "S'ha produït un error en processar el directori %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "La llista d'extensions de les fonts és massa llarga"
+
+#: ftparchive/apt-ftparchive.cc:401
+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:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Afegit doble d'una desviació %s -> %s"
+msgid "Error processing contents %s"
+msgstr "S'ha produït un error en processar el fitxer de continguts %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "No s'ha trobat cap selecció"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Fitxer de conf. duplicat %s/%s"
+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:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "La BD és vella, s'està intentant actualitzar %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "No es pot obrir el fitxer de DB %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "No es pot determinar l'estat de %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "No s'ha pogut llegir l'enllaç %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arxiu sense registre de control"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Arxiu sense el camp paquet"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s no té una entrada dominant\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  el mantenidor de %s és %s, no %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s no té una entrada dominant de font\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s no té una entrada dominant de binari\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, 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:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1878,17 +2275,6 @@ msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s"
 msgid "The diversion path is too long"
 msgstr "La ruta de desviació és massa llarga"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1917,30 +2303,36 @@ msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
 msgid "Unable to stat %s"
 msgstr "No es pot veure l'estat de %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode crida a un node que encara està enllaçat"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Ha fallat el tancament del fitxer %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "No s'ha trobat l'element diseminat!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "No s'ha pogut assignar la desviació"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "S'ha produït un error intern en AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, 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»"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Error intern, no s'ha pogut localitzar al membre %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Afegit doble d'una desviació %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "El fitxer de control no es pot analitzar"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Fitxer de conf. duplicat %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1988,201 +2380,52 @@ msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "S'està executant dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "El sistema d'empaquetament «%s» no està suportat"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "S'han escrit %i registres.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, 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 "This is not a valid DEB archive, missing '%s' member"
+msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Error intern, no s'ha pogut localitzar al membre %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "El fitxer de control no es pot analitzar"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "El resum no coincideix per a: %s"
-
-#: apt-pkg/cachefile.cc:94
-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: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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Memòria cau de paquets és buida"
-
-#: 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: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: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"
+msgid "List directory %spartial is missing."
+msgstr "Falta el directori de llistes %spartial."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Depèn"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Predepèn"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Suggereix"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Recomana"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Entra en conflicte"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Reemplaça"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Fa obsolet"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Trenca"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Millora"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "important"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "requerit"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "estàndard"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opcional"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Archives directory %spartial is missing."
+msgstr "Falta el directori d'arxius %spartial."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "No s'ha pogut trobar el mètode de control %s."
+msgid "Unable to lock directory %s"
+msgstr "No es pot blocar el directori %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El mètode %s no s'ha iniciat correctament"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "El tipus de fitxer índex «%s» no està suportat"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No s'ha pogut obrir el fitxer d'estat %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "S'està obtenint el fitxer %li de %li (falten %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
+msgid "Retrieving file %li of %li"
+msgstr "S'està obtenint el fitxer %li de %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2202,7 +2445,7 @@ msgstr "La mida no concorda"
 msgid "Invalid file format"
 msgstr "Operació no vàlida %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2211,16 +2454,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2229,12 +2472,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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2245,12 +2488,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "S'ha produït un error amb el GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2260,12 +2503,12 @@ msgstr ""
 "significar que haureu d'arreglar aquest paquet manualment (segons "
 "arquitectura)."
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2273,173 +2516,122 @@ msgstr ""
 "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
 "per al paquet %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "La memòria cau té un sistema de versions incompatible"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "No s'ha pogut trobar el mètode de control %s."
 
-#. 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
+#: 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/acquire-worker.cc:169
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "S'ha produït un error en processar %s (%s%d)"
+msgid "Method %s did not start correctly"
+msgstr "El mètode %s no s'ha iniciat correctament"
 
-#: 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/acquire-worker.cc:455
+#, 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/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: 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 ""
-"Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar."
+"El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu."
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
-"Uau, heu excedit el nombre de descripcions que aquest APT és capaç de "
-"gestionar. "
+"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
+"causat per paquets retinguts."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
-"Uau, heu excedit el nombre de dependències que aquest APT és capaç de "
-"gestionar."
+"No es poden corregir els problemes, teniu paquets retinguts que estan "
+"trencats."
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"No s'ha trobat el paquet %s %s en processar les dependències del fitxer"
-
-#: 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: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:1316
-msgid "Collecting File Provides"
-msgstr "S'estan recollint els fitxers que proveeixen"
+"No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat."
 
-#: 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/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"
 
-#: 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/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/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "El camp del proveïdor %s no té una empremta digital"
+msgid "Release '%s' for '%s' was not found"
+msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "Falta el directori de llistes %spartial."
+msgid "Version '%s' for '%s' was not found"
+msgstr "No s'ha trobat la versió «%s» per a «%s»"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Falta el directori d'arxius %spartial."
+msgid "Couldn't find task '%s'"
+msgstr "No s'ha pogut trobar la tasca «%s»"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "No es pot blocar el directori %s"
+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»"
 
-#. 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'està obtenint el fitxer %li de %li (falten %s)"
+#: 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/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, c-format
-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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 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/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No es pot veure l'estat de %s."
+"No s'han pogut seleccionar les versions del paquet «%s» ja que és purament "
+"virtual"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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/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)"
+"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/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 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)"
+"No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és "
+"purament virtual"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "No s'ha pogut configurar «%s»."
+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/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està "
+"instaŀlada"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2523,56 +2715,88 @@ msgstr "S'està escrivint una nova llista de fonts\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Les entrades de la llista de fonts per a aquest disc són:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "No es pot veure l'estat de %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "S'està construint l'arbre de dependències"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Versions candidates"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependències que genera"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "No s'ha pogut obrir el fitxer d'estat %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Envia l'escenari al resoledor"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Envia la petició al resoledor"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Prepara per a rebre una solució"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 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:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Executa un resoledor extern"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "No es pot analitzar el fitxer del paquet %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "S'han escrit %i registres.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "No es pot analitzar el fitxer del paquet %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "El resum no coincideix per a: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2599,6 +2823,224 @@ msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "El camp «Date» al fitxer Release %s és invàlid"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "El sistema d'empaquetament «%s» no està suportat"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "S'està executant dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "No s'ha pogut configurar «%s»."
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Memòria cau de paquets és buida"
+
+#: 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: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: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: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: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:321
+msgid "Depends"
+msgstr "Depèn"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Predepèn"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Suggereix"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Recomana"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Entra en conflicte"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Reemplaça"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Fa obsolet"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Trenca"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Millora"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "important"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "requerit"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "estàndard"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcional"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "S'estan recollint els fitxers que proveeixen"
+
+#: 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/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/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/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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2677,246 +3119,144 @@ msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
 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/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: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:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "No s'ha pogut trobar la tasca «%s»"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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: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»"
+msgid "Unable to parse package file %s (1)"
+msgstr "No es pot analitzar el fitxer del paquet %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "No es pot analitzar el fitxer del paquet %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 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"
+"Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han "
+"emprat els antics."
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "El camp del proveïdor %s no té una empremta digital"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "No es pot obtenir informació del punt de muntatge %s"
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "No s'ha pogut fer «stat» del cdrom"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "S'està instaŀlant %s"
+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/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "S'està configurant el paquet %s"
+msgid "Command line option %s is not understood"
+msgstr "No s'entén l'opció de la línia d'ordres %s"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "S'està suprimint el paquet %s"
+msgid "Command line option %s is not boolean"
+msgstr "No és lògica l'opció de la línia d'ordres %s"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "S'ha suprimit completament %s"
+msgid "Option %s requires an argument."
+msgstr "L'opció de la línia d'ordres %s precisa un paràmetre."
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "S'està anotant la desaparició de %s"
+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/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "S'està executant l'activador de postinstaŀlació %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "L'opció %s precisa un paràmetre numèric, no '%s'"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Manca el directori «%s»"
+msgid "Option '%s' is too long"
+msgstr "L'opció '%s' és massa llarga"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "No s'ha pogut obrir el fitxer «%s»"
+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/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "S'està preparant el paquet %s"
+msgid "Invalid operation %s"
+msgstr "Operació no vàlida %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "S'està desempaquetant %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Abreujament de tipus no reconegut: «%c»"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "S'està preparant per a configurar el paquet %s"
+msgid "Opening configuration file %s"
+msgstr "S'està obrint el fitxer de configuració %s"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "S'ha instaŀlat el paquet %s"
+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/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "S'està preparant per a la supressió del paquet %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Error sintàctic %s:%u: Etiqueta malformada"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "S'ha suprimit el paquet %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Error sintàctic %s:%u Text extra després del valor"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "S'està preparant per a suprimir completament el paquet %s"
+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/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "S'ha suprimit completament el paquet %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "S'ha interromput l'operació abans que pogués finalitzar"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "S'han produït problemes de depències, es deixa sense configurar"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
-"disc ple"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-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:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
-"disc ple"
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-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"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"No s'ha pogut bloquejar el directori d'administració (%s), hi ha cap altre "
-"procés utilitzant-lo?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Error sintàctic %s:%u: Inclusió des d'aquí"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, 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?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"S'ha interromput el dpkg, hauríeu d'executar manualment «%s» per a corregir "
-"el problema."
+"Error sintàctic %s:%u: la directiva clear requereix un arbre d'opcions com a "
+"argument"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "No blocat"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3036,54 +3376,11 @@ msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
 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%%"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "No s'ha trobat la selecció %s"
+msgid "No keyring installed in %s."
+msgstr "No s'ha instaŀlat cap clauer a %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3141,520 +3438,234 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "No keyring installed in %s."
-msgstr "No s'ha instaŀlat cap clauer a %s."
+msgid "%c%s... Error!"
+msgstr "%c%s… Error!"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/progress.cc:150
 #, 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."
+msgid "%c%s... Done"
+msgstr "%c%s… Fet"
 
-#: 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/progress.cc:181
+msgid "..."
+msgstr "…"
 
-#: apt-pkg/contrib/cmndline.cc:168
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "No és lògica l'opció de la línia d'ordres %s"
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "L'opció de la línia d'ordres %s precisa un paràmetre."
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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>"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "L'opció %s precisa un paràmetre numèric, no '%s'"
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "L'opció '%s' és massa llarga"
+msgid "%lis"
+msgstr "%lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, 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)."
+msgid "Selection %s not found"
+msgstr "No s'ha trobat la selecció %s"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "La llista de les extensions dels paquets és massa llarga"
+"No s'ha pogut bloquejar el directori d'administració (%s), hi ha cap altre "
+"procés utilitzant-lo?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "S'ha produït un error en processar el directori %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "La llista d'extensions de les fonts és massa llarga"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "No es pot blocar el directori d'administració (%s), sou root?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, 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:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "No s'ha trobat cap selecció"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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'"
+"S'ha interromput el dpkg, hauríeu d'executar manualment «%s» per a corregir "
+"el problema."
 
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "No blocat"
 
-#: ftparchive/cachedb.cc:83
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "La BD és vella, s'està intentant actualitzar %s"
-
-#: ftparchive/cachedb.cc:94
-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."
+msgid "Installing %s"
+msgstr "S'està instaŀlant %s"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "No es pot obrir el fitxer de DB %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "No s'ha pogut llegir l'enllaç %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arxiu sense registre de control"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "No es pot aconseguir un cursor"
+msgid "Configuring %s"
+msgstr "S'està configurant el paquet %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: No es pot llegir el directori %s\n"
+msgid "Removing %s"
+msgstr "S'està suprimint el paquet %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:98
 #, 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 "
+msgid "Completely removing %s"
+msgstr "S'ha suprimit completament %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:99
 #, 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"
+msgid "Noting disappearance of %s"
+msgstr "S'està anotant la desaparició de %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Failed to open %s"
-msgstr "No s'ha pogut obrir %s"
+msgid "Running post-installation trigger %s"
+msgstr "S'està executant l'activador de postinstaŀlació %s"
 
-#: ftparchive/writer.cc:278
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Directory '%s' missing"
+msgstr "Manca el directori «%s»"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "No s'ha pogut llegir l'enllaç %s"
+msgid "Could not open file '%s'"
+msgstr "No s'ha pogut obrir el fitxer «%s»"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "No s'ha pogut alliberar %s"
+msgid "Preparing %s"
+msgstr "S'està preparant el paquet %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** No s'ha pogut enllaçar %s a %s"
+msgid "Unpacking %s"
+msgstr "S'està desempaquetant %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink s'ha arribat al límit de %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arxiu sense el camp paquet"
+msgid "Preparing to configure %s"
+msgstr "S'està preparant per a configurar el paquet %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s no té una entrada dominant\n"
+msgid "Installed %s"
+msgstr "S'ha instaŀlat el paquet %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  el mantenidor de %s és %s, no %s\n"
+msgid "Preparing for removal of %s"
+msgstr "S'està preparant per a la supressió del paquet %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s no té una entrada dominant de font\n"
+msgid "Removed %s"
+msgstr "S'ha suprimit el paquet %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s no té una entrada dominant de binari\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - No s'ha pogut assignar espai en memòria"
+msgid "Preparing to completely remove %s"
+msgstr "S'està preparant per a suprimir completament el paquet %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unable to open %s"
-msgstr "No es pot obrir %s"
+msgid "Completely removed %s"
+msgstr "S'ha suprimit completament el paquet %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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'"
+msgid "Can not write log (%s)"
+msgstr "No es pot escriure en %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ó"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "No s'ha pogut crear FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "No s'ha pogut bifurcar"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "S'ha interromput l'operació abans que pogués finalitzar"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Comprimeix el fil"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports"
 
-#: 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"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "S'han produït problemes de depències, es deixa sense configurar"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Ha fallat l'E/S del subprocés sobre el fitxer"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica que és un error "
+"consequent de una fallida anterior."
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
+"disc ple"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "S'ha trobat un problema treient l'enllaç %s"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
+"falta de memòria"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 #, 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 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!"
+"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
+"disc ple"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"No s'ha escrit cap informe perquè el missatge d'error indica d'una fallida "
+"d'E/S del dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Error intern, AllUpgrade ha trencat coses"
 
 #~ 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 ba40ef385..5bb6a79b7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,14 +1,14 @@
 # Czech translation of APT
 # This file is put in the public domain.
-# Miroslav Kure <kurem@debian.cz>, 2004-2012.
+# Miroslav Kure <kurem@debian.cz>, 2004-2014.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2012-07-08 13:46+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\n"
+"PO-Revision-Date: 2014-08-15 13:30+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "Language: cs\n"
@@ -96,74 +96,74 @@ msgstr "Celkem přiřazeného místa: "
 msgid "Package file %s is out of sync."
 msgstr "Soubor balíku %s je špatně synchronizovaný."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Musíte zadat alespoň jeden vyhledávací vzor"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nelze najít balík %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Soubory balíku:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Vypíchnuté balíky:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(nenalezeno)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Instalovaná verze: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(žádná)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Vypíchnutý balík: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Tabulka verzí:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -252,6 +252,9 @@ msgid ""
 "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
 "mount point."
 msgstr ""
+"Na výchozím přípojném bodu nebylo rozpoznáno/nalezeno žádné CD-ROM.\n"
+"Můžete zkusit zadat přípojný bod CD-ROM volbou --cdrom.\n"
+"Více o rozpoznávání CD-ROM a přípojných bodech naleznete v „man apt-cdrom“."
 
 #: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -290,19 +293,19 @@ msgstr ""
 "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-get.cc:245
-#, fuzzy, c-format
+#, 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“"
+msgstr "Nelze najít balík pro architekturu „%s“"
 
 #: cmdline/apt-get.cc:327
-#, fuzzy, c-format
+#, 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“"
+msgstr "Nelze najít balík „%s“ s verzí „%s“"
 
 #: cmdline/apt-get.cc:330
-#, fuzzy, c-format
+#, 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“"
+msgstr "Nelze najít balík „%s“ z vydání „%s“"
 
 #: cmdline/apt-get.cc:367
 #, c-format
@@ -310,9 +313,9 @@ 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:423
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find version '%s' of package '%s'"
-msgstr "Ignoruje se nedostupná verze „%s“ balíku „%s“"
+msgstr "Nelze najít verzi „%s“ balíku „%s“"
 
 #: cmdline/apt-get.cc:454
 #, c-format
@@ -320,7 +323,7 @@ msgid "Couldn't find package %s"
 msgstr "Nelze najít balík %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nastaven jako instalovaný ru�ně.\n"
@@ -350,7 +353,7 @@ msgstr "Nelze zamknout adresář pro stahování"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nelze najít zdrojový balík pro %s"
@@ -378,10 +381,10 @@ msgstr ""
 #: cmdline/apt-get.cc:843
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "Přeskakuji dříve stažený soubor „%s“\n"
+msgstr "Přeskakuje se dříve stažený soubor „%s“\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nelze ur�it volné místo v %s"
@@ -396,14 +399,14 @@ msgstr "Na %s nemáte dostatek volného místa"
 #: cmdline/apt-get.cc:891
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
+msgstr "Nutno 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:896
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
+msgstr "Nutno stáhnout %sB zdrojových archivů.\n"
 
 #: cmdline/apt-get.cc:902
 #, c-format
@@ -414,41 +417,41 @@ msgstr "Stažení zdroje %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Stažení některých archivů selhalo."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Stahování dokon�eno v režimu pouze stáhnout"
 
 #: cmdline/apt-get.cc:950
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
+msgstr "Přeskakuje se rozbalení již rozbaleného zdroje v %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Zkontrolujte, zda je nainstalován balí�ek „dpkg-dev“.\n"
+msgstr "Zkontrolujte, zda je nainstalován balík „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Příkaz pro sestavení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Synovský proces selhal"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -457,17 +460,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:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nelze získat závislosti pro sestavení %s"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žádné závislosti pro sestavení.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -476,20 +479,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:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -498,7 +501,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -507,30 +510,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Chyba při zpracování závislostí pro sestavení"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Seznam změn %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -617,16 +620,20 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tato APT má schopnosti svaté krávy.\n"
 
-#: cmdline/apt-helper.cc:35
-#, fuzzy
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 msgid "Must specify at least one pair url/filename"
-msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
+msgstr "Musíte zadat aspoň jeden pár url/jméno souboru"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
-msgstr ""
+msgstr "Stažení selhalo"
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
+#, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -635,9 +642,19 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
+"Použití: apt-helper [volby] příkaz\n"
+"         apt-helper [volby] download-file uri cílová_cesta\n"
+"\n"
+"apt-helper je interní pomocník pro apt\n"
+"\n"
+"Příkazy:\n"
+"   download-file - stáhne zadané uri do cílové cesty\n"
+"\n"
+"                       Tento APT pomocník má schopnosti svatého �ehokoliv.\n"
 
 #: cmdline/apt-mark.cc:68
 #, c-format
@@ -664,11 +681,12 @@ msgstr "%s již byl podržen v aktuální verzi.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s již nebyl držen v aktuální verzi.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
-msgstr "ÄŒekal jsem na %s, ale nebyl tam"
+msgstr "ÄŒekali jsme na %s, ale nebyl tam"
 
 #: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
@@ -685,7 +703,6 @@ msgid "Executing dpkg failed. Are you root?"
 msgstr "Spuštění dpkg selhalo. Jste root?"
 
 #: cmdline/apt-mark.cc:392
-#, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -719,6 +736,11 @@ msgstr ""
 "Příkazy:\n"
 "   auto   - Ozna�í dané balíky jako instalované automaticky\n"
 "   manual - Ozna�í dané balíky jako instalované ru�ně\n"
+"   hold - Ozna�í balík jako podržený v aktuální verzi\n"
+"   unhold - Zruší podržení balíku v aktuální verzi\n"
+"   showauto - Vypíše seznam balíků instalovaných automaticky\n"
+"   showmanual - Vypíše seznam balíků instalovaných ru�ně\n"
+"   showhold - Vypíše seznam podržených balíků\n"
 "\n"
 "Volby:\n"
 "  -h   Tato nápověda.\n"
@@ -751,6 +773,23 @@ msgid ""
 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""
+"Použití: apt [volby] příkaz\n"
+"\n"
+"Řádkové rozhraní pro apt.\n"
+"Základní příkazy:\n"
+" list - vypíše balíky podle jmen\n"
+" search - hledá v popisech balíků\n"
+" show - zobrazí podrobnosti balíku\n"
+"\n"
+" update - aktualizuje seznam dostupných balíků\n"
+"\n"
+" install - nainstaluje balíky\n"
+" remove  - odstraní balíky\n"
+"\n"
+" upgrade - aktualizuje systém instalací/aktualizací balíků\n"
+" full-upgrade - aktualizuje systém instalací/aktualizací/odstraněním balíků\n"
+"\n"
+" edit-sources - upraví soubor se zdroji balíků\n"
 
 #: methods/cdrom.cc:203
 #, c-format
@@ -798,7 +837,7 @@ msgstr "Neplatné URI, lokální URI nesmí za�ínat na //"
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc:177
 msgid "Logging in"
-msgstr "Přihlašuji se"
+msgstr "Přihlašování"
 
 #: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
@@ -878,7 +917,7 @@ msgstr "Nelze vytvořit socket"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nelze připojit datový socket, �as spojení vypršel"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Selhalo"
 
@@ -924,7 +963,7 @@ msgstr "Spojení datového socketu vypršelo"
 msgid "Unable to accept connection"
 msgstr "Nelze přijmout spojení"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problém s kontrolním sou�tem souboru"
 
@@ -954,7 +993,7 @@ msgstr "Nelze vyvolat "
 #: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
-msgstr "Připojuji se k %s (%s)"
+msgstr "Připojování k %s (%s)"
 
 #: methods/connect.cc:87
 #, c-format
@@ -986,7 +1025,7 @@ msgstr "Nelze se připojit k %s:%s (%s)."
 #: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
-msgstr "Připojuji se k %s"
+msgstr "Připojování k %s"
 
 #: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
@@ -999,9 +1038,9 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Do�asné selhání při zjišťování „%s“"
 
 #: methods/connect.cc:209
-#, fuzzy, c-format
+#, c-format
 msgid "System error resolving '%s:%s'"
-msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - %s)"
+msgstr "Systémová chyba při překladu „%s:%s“"
 
 #: methods/connect.cc:211
 #, c-format
@@ -1033,6 +1072,8 @@ msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
+"Podepsaný soubor není platný, obdrženo „%s“ (vyžaduje přístup na síť "
+"ověření?)"
 
 #: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
@@ -1054,143 +1095,229 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Prázdné soubory nejsou platnými archivy"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba �tení ze serveru. Druhá strana zavřela spojení"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Chyba �tení ze serveru"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Výběr selhal"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Čas spojení vypršel"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
-msgstr "Čekám na hlavi�ky"
+msgstr "Čeká se na hlavi�ky"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Chybná hlavi�ka"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http server poslal neplatnou hlavi�ku odpovědi"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http server poslal neplatnou hlavi�ku Content-Length"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http server poslal neplatnou hlavi�ku Content-Range"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má porouchanou podporu rozsahů"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Neznámý formát data"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
-msgid "Sorting"
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Cíl "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Mám:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Pracuji]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
 msgstr ""
+"Výměna média: Vložte disk nazvaný\n"
+" „%s“\n"
+"do mechaniky „%s“ a stiskněte enter\n"
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Opravují se závislosti…"
 
-#: apt-private/private-install.cc:81
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"
+msgstr "Řadí se"
+
+#: apt-private/private-download.cc:36
+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:40
+msgid "Authentication warning overridden.\n"
+msgstr "Autentiza�ní varování potla�eno.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Některé balíky nemohly být autentizovány"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Instalovat tyto balíky bez ověření?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Selhalo stažení %s  %s\n"
+
+#: apt-private/private-install.cc:82
 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:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Potřebuji stáhnout %sB/%sB archivů.\n"
+msgstr "Nutno 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:159
+#: apt-private/private-install.cc:160
 #, c-format
 msgid "Need to get %sB of archives.\n"
-msgstr "Potřebuji stáhnout %sB archivů.\n"
+msgstr "Nutno 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Ano, udělej to tak, jak říkám!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1201,19 +1328,19 @@ msgstr ""
 "Pro pokra�ování opište frázi „%s“\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Přerušeno."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Chcete pokra�ovat?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Některé soubory nemohly být staženy"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1221,19 +1348,19 @@ msgstr ""
 "Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
 "fix-missing?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Nelze opravit chybějící balíky."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
-msgstr "Přerušuji instalaci."
+msgstr "Instalace se přerušuje."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1250,15 +1377,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1276,15 +1403,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnitřní chyba, AutoRemover pokazil věci"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1296,7 +1423,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1305,7 +1432,7 @@ 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:518
+#: apt-private/private-install.cc:519
 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“."
@@ -1324,7 +1451,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:628
+#: apt-private/private-install.cc:638
 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"
@@ -1335,209 +1462,190 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Poškozené balíky"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Následující extra balíky budou instalovány:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Doporu�ované balíky:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Přeskakuji %s, protože je již nainstalován.\n"
+msgstr "%s bude přesko�en, protože je již nainstalován.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
-"Přeskakuji %s, protože není nainstalován a vyžadovány jsou pouze "
+"%s bude přesko�en, protože není nainstalován a vyžadovány jsou pouze "
 "aktualizace.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s je již nejnovější verze.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
-msgstr ""
+msgstr "Vypisuje se"
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, 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"
+msgstr[0] "Existuje %i další verze. Zobrazíte ji přepína�em „-a“."
+msgstr[1] "Existují %i další verze. Zobrazíte je přepína�em „-a“."
+msgstr[2] "Existuje %i dalších verzí. Zobrazíte je přepína�em „-a“."
 
-#: 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
-msgstr ""
+msgstr "neznámá"
 
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
+#: apt-private/private-output.cc:265
+#, c-format
 msgid "[installed,upgradable to: %s]"
-msgstr "[Instalovaný]"
+msgstr "[instalovaný,aktualizovatelný na: %s]"
 
-#: apt-private/private-output.cc:237
-#, fuzzy
+#: apt-private/private-output.cc:268
 msgid "[installed,local]"
-msgstr "[Instalovaný]"
+msgstr "[instalovaný,lokální]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
-msgstr ""
+msgstr "[instalovaný,automaticky-odstranitelný]"
 
-#: apt-private/private-output.cc:242
-#, fuzzy
+#: apt-private/private-output.cc:272
 msgid "[installed,automatic]"
-msgstr "[Instalovaný]"
+msgstr "[instalovaný,automaticky]"
 
-#: apt-private/private-output.cc:244
-#, fuzzy
+#: apt-private/private-output.cc:274
 msgid "[installed]"
-msgstr "[Instalovaný]"
+msgstr "[instalovaný]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
-msgstr ""
+msgstr "[aktualizovatelný z: %s]"
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Následující balíky mají nesplněné závislosti:"
+msgstr "[zbytkové-konfigura�ní-coubory]"
 
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "ale %s je nainstalován"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale %s se bude instalovat"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ale nedá se nainstalovat"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "ale je to virtuální balík"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "ale není nainstalovaný"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "ale nebude se instalovat"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " nebo"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Následující balíky mají nesplněné závislosti:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Následující NOVÉ balíky budou nainstalovány:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Následující balíky budou ODSTRANĚNY:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 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:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Následující balíky budou aktualizovány:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Následující balíky budou DEGRADOV�NY:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 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:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (kvůli %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1545,27 +1653,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizováno, %lu nově instalováno, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu přeinstalováno, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradováno, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu instalováno nebo odstraněno pouze �áste�ně.\n"
@@ -1574,7 +1682,7 @@ msgstr "%lu instalováno nebo odstraněno pouze �áste�ně.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[Y/n]"
 
@@ -1582,162 +1690,94 @@ msgstr "[Y/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "Fulltextové hledání"
 
 #: 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[0] "Existuje %i další záznam. Zobrazíte jej přepína�em „-a“."
+msgstr[1] "Existují %i další záznamy. Zobrazíte je přepína�em „-a“."
+msgstr[2] "Existuje %i dalších záznamů. Zobrazíte je přepína�em „-a“."
 
 #: apt-private/private-show.cc:163
 msgid "not a real package (virtual)"
-msgstr ""
-
-#: 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:36
-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:40
-msgid "Authentication warning overridden.\n"
-msgstr "Autentiza�ní varování potla�eno.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Některé balíky nemohly být autentizovány"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Instalovat tyto balíky bez ověření?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Selhalo stažení %s  %s\n"
+msgstr "není skute�ný balík (virtuální)"
 
 #: apt-private/private-sources.cc:58
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to parse %s. Edit again? "
-msgstr "Selhalo přejmenování %s na %s"
+msgstr "Nepodařilo se zpracovat %s. Zkusit znovu upravit?"
 
 #: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "Soubor „%s“ se změnil, spusťte prosím „apt-get update“."
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
-msgstr ""
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Příkaz update neakceptuje žádné argumenty"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i balík může být aktualizován. Zobrazíte jej „apt list --upgradable“.\n"
+msgstr[1] ""
+"%i balíky mohou být aktualizovány. Zobrazíte je „apt list --upgradable“.\n"
+msgstr[2] ""
+"%i balíků může být aktualizováno. Zobrazíte je „apt list --upgradable“.\n"
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr "Všechny balíky jsou aktuální."
 
 #: 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"
+msgstr "Propo�ítává se aktualizace… "
 
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Hotovo"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Cíl "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Mám:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Pracuji]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Výměna média: Vložte disk nazvaný\n"
-" „%s“\n"
-"do mechaniky „%s“ a stiskněte enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nelze �íst %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1758,9 +1798,9 @@ msgid "Can not read mirror file '%s'"
 msgstr "Nelze �íst soubor se zrcadly „%s“"
 
 #: methods/mirror.cc:315
-#, fuzzy, c-format
+#, c-format
 msgid "No entry found in mirror file '%s'"
-msgstr "Nelze �íst soubor se zrcadly „%s“"
+msgstr "V souboru se zrcadly „%s“ nebyl nalezen žádný záznam"
 
 #: methods/mirror.cc:445
 #, c-format
@@ -1807,38 +1847,426 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalova
 
 #: dselect/update:30
 msgid "Merging available information"
-msgstr "Slu�uji dostupné informace"
+msgstr "Slu�ují se dostupné informace"
 
-#: 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"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Nelze lokalizovat hashovací prvek!"
+#: cmdline/apt-extracttemplates.cc:254
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nelze zavolat mkstemp %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Nelze alokovat diverzi"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nelze zapsat do %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Vnitřní chyba při AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nelze ur�it verzi programu debconf. Je debconf nainstalován?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Seznam rozšíření balíku je příliš dlouhý"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Chyba zpracování adresáře %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Seznam zdrojových rozšíření je příliš dlouhý"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Chyba při zapisování hlavi�ky do souboru"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dvojí přidání diverze %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Chyba při zpracovávání obsahu %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Žádný výběr nevyhověl"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Duplicitní konfigura�ní soubor %s/%s"
+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:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je stará, zkouším aktualizovat %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nelze otevřít DB soubor %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Nelze vyhodnotit %s"
+
+#: ftparchive/cachedb.cc:332
+msgid "Failed to read .dsc"
+msgstr "Nelze pře�íst .dsc"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Archiv nemá kontrolní záznam"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Archiv nemá pole Package"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr " %s nemá žádnou položku pro override\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  správce %s je %s, ne %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr " %s nemá žádnou zdrojovou položku pro override\n"
+
+#: ftparchive/writer.cc:710
+#, 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:351 ftparchive/contents.cc:382
+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
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Zkomolený override soubor %s, řádek %llu (%s)"
+
+#: 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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Selhalo přejmenování %s na %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1848,7 +2276,7 @@ msgstr "Cesta %s je příliš dlouhá"
 #: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
-msgstr "Rozbaluji %s vícekrát"
+msgstr "%s se rozbaluje vícekrát"
 
 #: apt-inst/extract.cc:142
 #, c-format
@@ -1864,17 +2292,6 @@ msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s"
 msgid "The diversion path is too long"
 msgstr "Diverzní cesta je příliš dlouhá"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1903,30 +2320,36 @@ msgstr "Soubor %s/%s přepisuje ten z balíku %s"
 msgid "Unable to stat %s"
 msgstr "Nelze vyhodnotit %s"
 
-#: 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/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/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Selhalo zavření souboru %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Nelze lokalizovat hashovací prvek!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Nelze alokovat diverzi"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Vnitřní chyba při AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Toto není platný DEB archiv, chybí �ást „%s“"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Vnitřní chyba, nemohu najít �ást %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dvojí přidání diverze %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Nezpracovatelný kontrolní soubor"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Duplicitní konfigura�ní soubor %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1974,198 +2397,52 @@ msgstr "Kontrolní sou�et taru selhal, archiv je poškozený"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznámá hlavi�ka TARu typ %u, �len %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Spouštím dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Balí�kovací systém „%s“ není podporován"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Zapsáno %i záznamů.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, 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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n"
-
-#: 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 "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
-
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Nelze najít autentiza�ní záznam pro: %s"
-
-#: apt-pkg/indexcopy.cc:521
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Neshoda kontrolních sou�tů pro: %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/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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Cache balíků je prázdná"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Cache soubor balíků je poškozen"
-
-#: 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:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Cache soubor balíků je poškozen, je příliš malý"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Toto není platný DEB archiv, chybí �ást „%s“"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-inst/deb/debfile.cc:132
 #, 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: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:321
-msgid "Depends"
-msgstr "Závisí na"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Předzávisí na"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Navrhuje"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Doporu�uje"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Koliduje s"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Nahrazuje"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Zastarává"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Porušuje"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Rozšiřuje"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "důležitý"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "vyžadovaný"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standardní"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "volitelný"
+msgid "Internal error, could not locate member %s"
+msgstr "Vnitřní chyba, nemohu najít �ást %s"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Nezpracovatelný kontrolní soubor"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ovlada� metody %s nemohl být nalezen."
-
-#: 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"
+msgid "List directory %spartial is missing."
+msgstr "Adresář seznamů %spartial chybí."
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nebyla spuštěna správně"
+msgid "Archives directory %spartial is missing."
+msgstr "Archivní adresář %spartial chybí."
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire.cc:99
 #, 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."
+msgid "Unable to lock directory %s"
+msgstr "Nelze uzamknout adresář %s"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový typ souboru „%s“ není podporován"
-
-#: 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"
+msgid "Clean of %s is not supported"
+msgstr "Vy�ištění %s není podporováno"
 
-#: apt-pkg/depcache.cc:250
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nelze otevřít stavový soubor %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Stahuje se soubor %li z %li (zbývá %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nelze zapsat do�asný stavový soubor %s"
+msgid "Retrieving file %li of %li"
+msgstr "Stahuje se soubor %li z %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2181,11 +2458,10 @@ msgid "Size mismatch"
 msgstr "Velikosti nesouhlasí"
 
 #: apt-pkg/acquire-item.cc:173
-#, fuzzy
 msgid "Invalid file format"
-msgstr "Neplatná operace %s"
+msgstr "Neplatná formát souboru"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2194,16 +2470,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2212,12 +2488,12 @@ msgstr ""
 "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto "
 "repositáře se nepoužijí."
 
-#: apt-pkg/acquire-item.cc:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2227,12 +2503,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:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2241,177 +2517,122 @@ 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, 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/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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Chyba při zpracování %s (%s%d)"
-
-#: 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: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."
+msgid "The method driver %s could not be found."
+msgstr "Ovlada� metody %s nemohl být nalezen."
 
-#: 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/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Je balík %s nainstalován?"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nebyla spuštěna správně"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, 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"
+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/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
+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/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/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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
+#: 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nelze zapsat do %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/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/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"
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Blok výrobce %s neobsahuje otisk klí�e"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Nelze pře�íst seznam zdrojů."
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "Adresář seznamů %spartial chybí."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Archivní adresář %spartial chybí."
+msgid "Version '%s' for '%s' was not found"
+msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nelze uzamknout adresář %s"
+msgid "Couldn't find task '%s'"
+msgstr "Nelze najít úlohu „%s“"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Stahuji soubor %li z %li (%s zbývá)"
+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/acquire.cc:901
+#: apt-pkg/cacheset.cc:615
 #, c-format
-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"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nelze najít balík vyhovující masce „%s“"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Nebylo možno vyhodnotit %s."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
+"Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože "
+"žádné takové verze nemá"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, 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)"
+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/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nelze nastavit „%s“."
+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/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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."
+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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2420,24 +2641,24 @@ 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"
+msgstr "Odpojuje se 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"
+msgstr "Používá se přípojný bod %s\n"
 
 #: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
-msgstr "Čekám na disk…\n"
+msgstr "Čeká se na disk…\n"
 
 #: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
-msgstr "Připojuji CD-ROM…\n"
+msgstr "Připojuje se CD-ROM…\n"
 
 #: apt-pkg/cdrom.cc:620
 msgid "Identifying... "
-msgstr "Rozpoznávám… "
+msgstr "Rozpoznává se… "
 
 #: apt-pkg/cdrom.cc:662
 #, c-format
@@ -2446,7 +2667,7 @@ msgstr "Uložený název: %s \n"
 
 #: apt-pkg/cdrom.cc:680
 msgid "Scanning disc for index files...\n"
-msgstr "Hledám na disku indexové soubory…\n"
+msgstr "Na disku se hledají indexové soubory…\n"
 
 #: apt-pkg/cdrom.cc:734
 #, c-format
@@ -2485,63 +2706,96 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
-msgstr "Kopíruji seznamy balíků…"
+msgstr "Kopírují se seznamy balíků…"
 
 #: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
-msgstr "Zapisuji nový seznam balíků\n"
+msgstr "Zapisuje se nový seznam balíků\n"
 
 #: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Seznamy zdrojů na tomto disku jsou:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Nebylo možno vyhodnotit %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytváří se strom závislostí"
 
-#: 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátské verze"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "Nelze otevřít stavový soubor %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nelze zapsat do�asný stavový soubor %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Scénář odeslán řešiteli"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Požadavek odeslán řešiteli"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Příprava na obdržení řešení"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 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:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Spuštění externího řešitele"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nelze zpracovat soubor %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Zapsáno %i záznamů.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nelze zpracovat soubor %s (2)"
+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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n"
+
+#: 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 "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Nelze najít autentiza�ní záznam pro: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Neshoda kontrolních sou�tů pro: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2568,10 +2822,220 @@ msgstr "Neplatná položka „Valid-Until“ v Release souboru %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Neplatná položka „Date“ v Release souboru %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Balí�kovací systém „%s“ není podporován"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr "Postup: [%3i%%]"
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Spouští se dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nelze nastavit „%s“."
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Cache balíků je prázdná"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Cache soubor balíků je poškozen"
+
+#: 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: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: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: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:321
+msgid "Depends"
+msgstr "Závisí na"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Předzávisí na"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Navrhuje"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Doporu�uje"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Koliduje s"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Nahrazuje"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Zastarává"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Porušuje"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Rozšiřuje"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "důležitý"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "vyžadovaný"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standardní"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "volitelný"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový typ souboru „%s“ není podporován"
+
+#: 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 ""
+"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/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
+
 #: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
+msgstr "Zkomolená �ást %u v seznamu zdrojů %s (zpracování URI)"
 
 #: apt-pkg/sourcelist.cc:170
 #, c-format
@@ -2626,7 +3090,7 @@ 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"
+msgstr "Otevírá se %s"
 
 #: apt-pkg/sourcelist.cc:371
 #, c-format
@@ -2639,244 +3103,154 @@ 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/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:492
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ „%s“ v �ásti %u v seznamu zdrojů %s není známý"
 
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nelze najít úlohu „%s“"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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: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“"
+msgid "Unable to parse package file %s (1)"
+msgstr "Nelze zpracovat soubor %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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í"
+msgid "Unable to parse package file %s (2)"
+msgstr "Nelze zpracovat soubor %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože "
-"žádné takové verze nemá"
-
-#: 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í"
+"Některé indexové soubory se nepodařilo stáhnout. Jsou ignorovány, nebo jsou "
+"použity starší verze."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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á"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blok výrobce %s neobsahuje otisk klí�e"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Nelze vyhodnotit přípojný bod %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "Instaluji %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Nezdařilo se vyhodnotit cdrom"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "Nastavuji %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Parametr příkazové řádky „%c“ [z %s] je neznámý"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Odstraňuji %s"
+msgid "Command line option %s is not understood"
+msgstr "Nerozumím parametru %s příkazové řádky"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "Kompletně odstraňuji %s"
+msgid "Command line option %s is not boolean"
+msgstr "Parametr příkazové řádky %s není pravdivostní hodnota"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Zna�ím si zmizení %s"
+msgid "Option %s requires an argument."
+msgstr "Volba %s vyžaduje argument."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Spouštím poinstala�ní spouště� %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Parametr %s: Zadání konfigura�ní položky musí obsahovat =<hodn>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Adresář „%s“ chybí"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Volba %s vyžaduje jako argument celé �íslo (integer), ne „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Nelze otevřít soubor „%s“"
+msgid "Option '%s' is too long"
+msgstr "Volba „%s“ je příliš dlouhá"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Připravuji %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Nechápu význam %s, zkuste true nebo false."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Rozbaluji %s"
+msgid "Invalid operation %s"
+msgstr "Neplatná operace %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Připravuji nastavení %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Nerozpoznaná zkratka typu: „%c“"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "Nainstalován %s"
+msgid "Opening configuration file %s"
+msgstr "Otevírá se konfigura�ní soubor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Připravuji odstranění %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaktická chyba %s:%u: Blok neza�íná jménem."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "Odstraněn %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaktická chyba %s:%u: Zkomolená zna�ka"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Připravuji úplné odstranění %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbyte�né smetí"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Kompletně odstraněn %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-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:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-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:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-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:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 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."
+"Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, 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?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Nelze uzamknout administra�ní adresář (%s). Jste root?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, 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“."
+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/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Není uzam�en"
+#: 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í"
 
 #: 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í"
+msgstr "Nepoužívá se zamykání pro zámkový soubor %s, který je pouze pro �tení"
 
 #: apt-pkg/contrib/fileutl.cc:195
 #, c-format
@@ -2886,7 +3260,7 @@ 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"
+msgstr "Nepoužívá se zamykání pro zámkový soubor %s připojený přes nfs"
 
 #: apt-pkg/contrib/fileutl.cc:223
 #, c-format
@@ -2960,12 +3334,12 @@ msgstr "Nezdařilo se spustit kompresor "
 #: apt-pkg/contrib/fileutl.cc:1514
 #, 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á"
+msgstr "�tení, stále se má pře�íst %llu, ale už nic nezbývá"
 
 #: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
 #, 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"
+msgstr "zápis, stále se má zapsat %llu, ale nejde to"
 
 #: apt-pkg/contrib/fileutl.cc:1915
 #, c-format
@@ -2986,54 +3360,11 @@ msgstr "Problém při odstraňování souboru %s"
 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%%"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Výběr %s nenalezen"
+msgid "No keyring installed in %s."
+msgstr "V %s není nainstalována žádná klí�enka."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3089,518 +3420,229 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Command line option %s is not understood"
-msgstr "Nerozumím parametru %s příkazové řádky"
+msgid "%c%s... Error!"
+msgstr "%c%s… Chyba!"
 
-#: apt-pkg/contrib/cmndline.cc:168
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Parametr příkazové řádky %s není pravdivostní hodnota"
+msgid "%c%s... Done"
+msgstr "%c%s… Hotovo"
 
-#: 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/progress.cc:181
+msgid "..."
+msgstr "…"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Parametr %s: Zadání konfigura�ní položky musí obsahovat =<hodn>."
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Volba %s vyžaduje jako argument celé �íslo (integer), ne „%s“"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Volba „%s“ je příliš dlouhá"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Nechápu význam %s, zkuste true nebo false."
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Seznam rozšíření balíku je příliš dlouhý"
+msgid "%lis"
+msgstr "%lis"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Chyba zpracování adresáře %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Seznam zdrojových rozšíření je příliš dlouhý"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Chyba při zapisování hlavi�ky do souboru"
+msgid "Selection %s not found"
+msgstr "Výběr %s nenalezen"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Chyba při zpracovávání obsahu %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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:841
-msgid "No selections matched"
-msgstr "Žádný výběr nevyhověl"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "Nelze uzamknout administra�ní adresář (%s). Používá jej jiný proces?"
 
-#: ftparchive/cachedb.cc:65
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB je porušená, soubor přejmenován na %s.old"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nelze uzamknout administra�ní adresář (%s). Jste root?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je stará, zkouším aktualizovat %s"
-
-#: ftparchive/cachedb.cc:94
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nelze otevřít DB soubor %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nelze pře�íst link %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Archiv nemá kontrolní záznam"
-
-#: ftparchive/cachedb.cc:594
-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"
+"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“."
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Průchod stromem selhal"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Není uzam�en"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "Nelze otevřít %s"
+msgid "Installing %s"
+msgstr "Instaluje se %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "Odlinkování %s [%s]\n"
+msgid "Configuring %s"
+msgstr "Nastavuje se %s"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Nelze pře�íst link %s"
+msgid "Removing %s"
+msgstr "Odstraňuje se %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Nelze odlinkovat %s"
+msgid "Completely removing %s"
+msgstr "Kompletně se odstraňuje %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nezdařilo se slinkovat %s s %s"
+msgid "Noting disappearance of %s"
+msgstr "Zna�ím si zmizení %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Odlinkovací limit %sB dosažen.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archiv nemá pole Package"
+msgid "Running post-installation trigger %s"
+msgstr "Spouští se poinstala�ní spouště� %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s nemá žádnou položku pro override\n"
+msgid "Directory '%s' missing"
+msgstr "Adresář „%s“ chybí"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  správce %s je %s, ne %s\n"
+msgid "Could not open file '%s'"
+msgstr "Nelze otevřít soubor „%s“"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s nemá žádnou zdrojovou položku pro override\n"
+msgid "Preparing %s"
+msgstr "Připravuje se %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Selhal pokus o přidělení paměti"
+msgid "Unpacking %s"
+msgstr "Rozbaluje se %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, 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"
+msgid "Preparing to configure %s"
+msgstr "Připravuje se nastavení %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nezdařilo se pře�íst override soubor %s"
+msgid "Installed %s"
+msgstr "Nainstalován %s"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Zkomolený override soubor %s, řádek %llu #1"
+msgid "Preparing for removal of %s"
+msgstr "Připravuje se odstranění %s"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Zkomolený override soubor %s, řádek %llu #2"
+msgid "Removed %s"
+msgstr "Odstraněn %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Zkomolený override soubor %s, řádek %llu #3"
+msgid "Preparing to completely remove %s"
+msgstr "Připravuje se úplné odstranění %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Neznámý kompresní algoritmus „%s“"
+msgid "Completely removed %s"
+msgstr "Kompletně odstraněn %s"
 
-#: ftparchive/multicompress.cc:103
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimovaný výstup %s potřebuje kompresní sadu"
+msgid "Can not write log (%s)"
+msgstr "Nelze zapsat log (%s)"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Selhalo vytvoření FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr "Je /dev/pts připojeno?"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Volání fork() se nezdařilo"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr "Je standardní výstup terminál?"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimovat potomka"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "Operace byla přerušena dříve, než mohla skon�it"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Interní chyba, nezdařilo se vytvořit %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+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"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "V/V operace s podprocesem/souborem selhala"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Chyba �tení při výpo�tu MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+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."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problém s odlinkováním %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+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."
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška nazna�uje, že "
+"je chyba způsobena zcela zaplněnou pamětí."
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Neznámý záznam o balíku!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška nazna�uje, že "
+"je chyba na lokálním systému."
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška nazna�uje V/V "
+"chybu dpkg."
+
+#~ msgid "ioctl(TIOCGWINSZ) failed"
+#~ msgstr "volání ioctl(TIOCGWINSZ) selhalo"
 
 #~ 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 84af8238f..dbf4bfba9 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -110,79 +110,79 @@ msgstr "Cyfanswm Gofod Cyfrifwyd: "
 msgid "Package file %s is out of sync."
 msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni ellir lleoli'r pecyn %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 #, fuzzy
 msgid "Package files:"
 msgstr "Ffeiliau Pecynnau:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 #, fuzzy
 msgid "Pinned packages:"
 msgstr "Pecynnau wedi eu Pinio:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(heb ganfod)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Wedi Sefydlu: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Ymgeisydd: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(dim)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 #, fuzzy
 msgid "  Package pin: "
 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 #, fuzzy
 msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -348,7 +348,7 @@ msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
@@ -377,7 +377,7 @@ msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
@@ -403,7 +403,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
@@ -436,7 +436,7 @@ msgstr "Cyrchu Ffynhonell %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
@@ -445,48 +445,48 @@ msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -495,7 +495,7 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -504,14 +504,14 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -520,7 +520,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:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -529,32 +529,32 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -641,16 +641,20 @@ msgstr ""
 "\n"
 "                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -659,6 +663,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -688,8 +693,9 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 msgid "%s was already not hold.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, fuzzy, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Arhoswyd am %s ond nid oedd e yna"
@@ -888,7 +894,7 @@ msgstr "Methwyd creu soced"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Methwyd"
 
@@ -936,7 +942,7 @@ msgstr "Goramserodd cysylltiad y soced data"
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
@@ -1066,150 +1072,238 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Methwyd dewis"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Yn aros am benawdau"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 #, fuzzy
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 #, fuzzy
 msgid "This HTTP server has broken range support"
 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Presennol "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Cyrchu:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Anwybyddu "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Gwall "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Gweithio]"
+
+#: apt-private/acqprogress.cc:297
+#, fuzzy, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+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-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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#, fuzzy
+msgid "Some packages could not be authenticated"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Methwyd cyrchu %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 #, 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:109
+#: apt-private/private-install.cc:110
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1220,19 +1314,19 @@ msgstr ""
 "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
 " ?]"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Erthylu."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Ydych chi eisiau mynd ymlaen?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1240,20 +1334,20 @@ msgstr ""
 "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
 "geidio defnyddio --fix-missing?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 #, fuzzy
 msgid "Aborting install."
 msgstr "Yn Erthylu'r Sefydliad."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1263,15 +1357,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1287,16 +1381,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1306,7 +1400,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:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1314,7 +1408,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:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
@@ -1334,7 +1428,7 @@ msgstr ""
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1346,68 +1440,68 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1415,139 +1509,119 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Sefydliwyd]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Sefydliwyd]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Sefydliwyd]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Sefydliwyd]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "ond mae %s wedi ei sefydlu"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ond ni ellir ei sefydlu"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "ond mae'n becyn rhithwir"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "ond nid yw wedi ei sefydlu"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "ond nid yw'n mynd i gael ei sefydlu"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " neu"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Caiff y pecynnau canlynol eu TYNNU:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 #, fuzzy
 msgid "The following packages will be upgraded:"
 msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 #, fuzzy
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (oherwydd %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -1557,27 +1631,27 @@ msgstr ""
 "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
 "ei wneud!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu wedi ailsefydlu, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu wedi eu israddio, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
@@ -1586,7 +1660,7 @@ msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1594,36 +1668,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "I"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1637,37 +1703,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-#, fuzzy
-msgid "Some packages could not be authenticated"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr ""
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Methwyd cyrchu %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1678,8 +1713,20 @@ msgstr "Methwyd ailenwi %s at %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: 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-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
@@ -1687,66 +1734,24 @@ msgstr ""
 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Wedi Gorffen"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Presennol "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Cyrchu:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Anwybyddu "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Gwall "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Gweithio]"
-
-#: apt-private/acqprogress.cc:297
-#, fuzzy, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1823,38 +1828,434 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yn cyfuno manylion Ar Gael"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
+# 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Methyd lleoli yr elfen <hash>!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ni ellir gwneud stat() o %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Methwyd neilltuo dargyfeiriad"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"
 
-#: apt-inst/filelist.cc:464
+#: 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:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#, fuzzy, c-format
+msgid "Error processing directory %s"
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
+
+#: ftparchive/apt-ftparchive.cc:431
+#, fuzzy, c-format
+msgid "Error processing contents %s"
+msgstr "Gwall wrth Brosesu Cynnwys %s"
+
+# FIXME: full stops
+#: ftparchive/apt-ftparchive.cc:626
 #, fuzzy
-msgid "Internal error in AddDiversion"
-msgstr "Gwall Mewnol yn AddDiversion"
+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"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:822
+msgid "No selections matched"
+msgstr "Dim dewisiadau'n cyfateb"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"
 
-# FIXME: "the"
-#: apt-inst/filelist.cc:506
+#: ftparchive/cachedb.cc:65
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/cachedb.cc:83
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Ffeil cyfluniad dyblyg %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni ellir agor y ffeil DB2 %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Methwyd darllen y cyswllt %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Does dim cofnod rheoli gan yr archif"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Doedd dim maes pecyn gan yr archif"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Cynaliwr %s yw %s nid %s\n"
+
+#: ftparchive/writer.cc:706
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/writer.cc:710
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"
+
+# FIXME: "debian"
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1880,17 +2281,6 @@ msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
 msgid "The diversion path is too long"
 msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1921,31 +2311,38 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 msgid "Unable to stat %s"
 msgstr "Ni ellir gwneud stat() o %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Methwyd cau ffeil %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Methyd lleoli yr elfen <hash>!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Methwyd neilltuo dargyfeiriad"
+
+#: apt-inst/filelist.cc:464
+#, fuzzy
+msgid "Internal error in AddDiversion"
+msgstr "Gwall Mewnol yn AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, 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"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
-#, fuzzy, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+# FIXME: "the"
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-#, fuzzy
-msgid "Unparsable control file"
-msgstr "Ffeil rheoli ni ellir ei ramadegu"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ffeil cyfluniad dyblyg %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1994,207 +2391,53 @@ msgstr "Methodd swm gwirio Tar, archif llygredig"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Math pennawd TAR anhysbys %u, aelod %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Ni chynhelir y system pecynnu '%s'"
-
-#: apt-pkg/init.cc:162
-#, fuzzy
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ni ellir canfod math system addas"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
-
-#: 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 ""
-
-#: apt-pkg/indexcopy.cc:515
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-inst/deb/debfile.cc:132
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Camgyfatebiaeth swm MD5"
-
-#: 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/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."
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Methwyd darllen y rhestr ffynhonellau."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Storfa pecyn gwag"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-inst/deb/debfile.cc:227
 #, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+msgid "Unparsable control file"
+msgstr "Ffeil rheoli ni ellir ei ramadegu"
 
-# FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, 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:179
-msgid "The package cache was built for a different architecture"
-msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Dibynnu"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "CynDdibynnu"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Awgrymu"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Argymell"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Gwrthdaro"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Amnewid"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Darfodi"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "pwysig"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "angenrheidiol"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "safonnol"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opsiynnol"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "ychwanegol"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
+msgid "List directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire.cc:99
 #, 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"
+msgid "Unable to lock directory %s"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "Ni chynhelir y math ffeil mynegai '%s'"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
-
-#: apt-pkg/depcache.cc:139
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
-
-#: 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 "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgid "Retrieving file %li of %li"
+msgstr "Yn Darllen Rhestr Ffeiliau"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2215,7 +2458,7 @@ msgstr "Camgyfatebiaeth maint"
 msgid "Invalid file format"
 msgstr "Gweithred annilys %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2223,28 +2466,28 @@ msgid ""
 msgstr ""
 
 # FIXME: number?
-#: apt-pkg/acquire-item.cc:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2252,13 +2495,13 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
 # FIXME: case
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2267,182 +2510,125 @@ 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
 
-#: apt-pkg/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: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/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
 msgstr ""
-"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
 
-#: 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: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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:455
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
+"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/pkgcachegen.cc:576
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+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/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+#: 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/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/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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
+#: 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."
 
-#: 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/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Methwyd darllen y rhestr ffynhonellau."
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+#: 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/acquire.cc:91
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
+msgid "Couldn't find task '%s'"
+msgstr "Methwyd canfod pecyn %s"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:609
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr ""
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Methwyd canfod pecyn %s"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Yn Darllen Rhestr Ffeiliau"
-
-#: 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"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Methwyd canfod pecyn %s"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-# FIXME: literal
-#: apt-pkg/policy.cc:422
-#, 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:444
+#: apt-pkg/cacheset.cc:647
 #, c-format
-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"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Methwyd agor ffeil %s"
-
-# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2524,57 +2710,90 @@ msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
 
-#: 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/depcache.cc:139
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
+
+#: 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 "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"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-# FIXME: number?
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgid "Wrote %i records.\n"
+msgstr ""
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Camgyfatebiaeth swm MD5"
 
 # FIXME: number?
 #: apt-pkg/indexrecords.cc:78
@@ -2603,6 +2822,222 @@ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Ni chynhelir y system pecynnu '%s'"
+
+#: apt-pkg/init.cc:162
+#, fuzzy
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ni ellir canfod math system addas"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Methwyd agor ffeil %s"
+
+# FIXME: %s may have an arbirrary length
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Storfa pecyn gwag"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+
+#: 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: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: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:179
+msgid "The package cache was built for a different architecture"
+msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Dibynnu"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "CynDdibynnu"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Awgrymu"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Argymell"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Gwrthdaro"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Amnewid"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Darfodi"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "pwysig"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "angenrheidiol"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "safonnol"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opsiynnol"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "ychwanegol"
+
+#: 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: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: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: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: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: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: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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#: 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:1316
+msgid "Collecting File Provides"
+msgstr "Yn Casglu Darpariaethau Ffeil"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+
+#: 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 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:444
+#, c-format
+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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2683,221 +3118,150 @@ msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 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/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+# 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/cacheset.cc:492
+# FIXME: number?
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Methwyd canfod pecyn %s"
-
-#: 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:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Methwyd canfod pecyn %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 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"
+"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."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "  Wedi Sefydlu: "
-
-#: 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:97 apt-pkg/deb/dpkgpm.cc:1003
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Yn agor %s"
+msgid "Unable to stat the mount point %s"
+msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Methwyd dileu %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Methwyd gwneud stat() o'r CD-ROM"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+# FIXME
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
+msgid "Command line option %s is not understood"
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+#: 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/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/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/deb/dpkgpm.cc:989
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Yn agor %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 "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
 
-#: apt-pkg/deb/dpkgpm.cc:990
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Yn agor %s"
+#: 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/deb/dpkgpm.cc:995
-#, fuzzy, c-format
-msgid "Preparing to configure %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsiwn '%s' yn rhy hir"
 
-#: apt-pkg/deb/dpkgpm.cc:997
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr "  Wedi Sefydlu: "
+# 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/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
+msgid "Invalid operation %s"
+msgstr "Gweithred annilys %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Argymell"
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Talgryniad math anhysbys: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
-#, fuzzy, c-format
-msgid "Preparing to completely remove %s"
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Methwyd dileu %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
+#: 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."
 
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+# FIXME
+#: apt-pkg/contrib/configuration.cc:820
 #, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Ni ellir ysgrifennu i %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: 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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, 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:110
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+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/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3014,54 +3378,11 @@ msgstr "Gwall wrth dadgysylltu'r ffeil"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Wedi Gorffen"
-
-#. 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"
+msgid "No keyring installed in %s."
+msgstr "Yn Erthylu'r Sefydliad."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3117,529 +3438,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Talgryniad math anhysbys: '%c'"
+msgid "%c%s... Error!"
+msgstr "%c%s... Gwall!"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgid "%c%s... Done"
+msgstr "%c%s... Wedi Gorffen"
 
-#: 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."
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
 
-# FIXME
-#: apt-pkg/contrib/configuration.cc:820
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Wedi Gorffen"
 
-#: apt-pkg/contrib/configuration.cc:877
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid "%lid %lih %limin %lis"
 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
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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"
+msgid "%lih %limin %lis"
 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
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opsiwn '%s' yn rhy hir"
+msgid "%lis"
+msgstr ""
 
-# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, fuzzy, c-format
-msgid "Error processing directory %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
-msgid "Error processing contents %s"
-msgstr "Gwall wrth Brosesu Cynnwys %s"
-
-# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:626
-#, 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:841
-msgid "No selections matched"
-msgstr "Dim dewisiadau'n cyfateb"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
-
-#: ftparchive/cachedb.cc:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Methwyd darllen y cyswllt %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Does dim cofnod rheoli gan yr archif"
-
-#: ftparchive/cachedb.cc:594
-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"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-# FIXME
-#: ftparchive/writer.cc:278
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DatGysylltu %s [%s]\n"
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Wedi Sefydlu: "
 
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Methwyd darllen y cyswllt %s"
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Methwyd datgysylltu %s"
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Yn agor %s"
 
-#: ftparchive/writer.cc:298
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Methwyd cysylltu %s at %s"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Methwyd dileu %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Doedd dim maes pecyn gan yr archif"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid "Running post-installation trigger %s"
+msgstr ""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Cynaliwr %s yw %s nid %s\n"
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid "Could not open file '%s'"
+msgstr "Methwyd agor ffeil %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:992
 #, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid "Preparing %s"
+msgstr "Yn agor %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Methwyd neilltuo cof"
+#: apt-pkg/deb/dpkgpm.cc:993
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Yn agor %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "Ni ellir agor %s"
+#: apt-pkg/deb/dpkgpm.cc:998
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+msgid "Installed %s"
+msgstr "  Wedi Sefydlu: "
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Methwydd darllen y ffeil dargyfeirio %s"
+msgid "Preparing for removal of %s"
+msgstr ""
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+msgid "Removed %s"
+msgstr "Argymell"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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"
+msgid "Can not write log (%s)"
+msgstr "Ni ellir ysgrifennu i %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Methwyd creu FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Methodd fork()"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-#, fuzzy
-msgid "Compress child"
-msgstr "Plentyn Cywasgu"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, fuzzy, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Methodd MA i isbroses/ffeil"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Methwyd darllen wrth gyfrifo MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gwall wrth datgysylltu %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-# FIXME: "debian"
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #~ 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 964b6d0c5..11ef78a5e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,20 +1,20 @@
 # Danish translation apt.
-# Copyright (C) 2013 apt & nedenstående oversættere.
+# Copyright (C) 2014 apt & nedenstående oversættere.
 # This file is distributed under the same license as the apt package.
 # Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2002, 2003, 2004, 2005, 2006, 2007.
-# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012, 2013.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012, 2013, 2014.
 #
 # solver -> problemløser
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2013-12-14 23:51+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\n"
+"PO-Revision-Date: 2014-07-06 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -99,77 +99,77 @@ msgstr "Total plads, der kan gøres rede for: "
 msgid "Package file %s is out of sync."
 msgstr "Pakkefilen %s er ude af trit."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Du skal angive mindst ét søgemønster"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 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:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "»Pinned« pakker:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(ikke fundet)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Installeret: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Pakke-pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Versionstabel:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -254,17 +254,16 @@ msgid "Failed to mount '%s' to '%s'"
 msgstr "Kunne ikke montere %s til %s"
 
 #: 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."
+"Ingen cd-rom kunne detekteres eller findes via standardmonteringspunktet.\n"
+"Du kan prøve tilvalget --cdrom for at angive cd-rom-monteringspunktet.\n"
+"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."
@@ -333,7 +332,7 @@ msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s sat til manuelt installeret.\n"
@@ -363,7 +362,7 @@ msgstr "Kunne ikke låse nedhentningsmappen"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunne ikke finde kildetekstpakken for %s"
@@ -394,7 +393,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Overspringer allerede hentet fil »%s«\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunne ikke bestemme ledig plads i %s"
@@ -427,7 +426,7 @@ msgstr "Henter kildetekst %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Nedhentning afsluttet i »hent-kun«-tilstand"
 
@@ -436,30 +435,30 @@ msgstr "Nedhentning afsluttet i »hent-kun«-tilstand"
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen »%s« fejlede.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen »%s« fejlede.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -468,17 +467,17 @@ msgstr ""
 "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::"
 "Architectures for opsætning"
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen opbygningsafhængigheder.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -486,7 +485,7 @@ msgid ""
 msgstr ""
 "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -494,14 +493,14 @@ msgid ""
 msgstr ""
 "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,30 +518,30 @@ msgstr ""
 "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
 "kandidatversion"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafhængighederne"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Ændringslog for %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Understøttede moduler:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -630,16 +629,20 @@ msgstr ""
 "for flere oplysninger og tilvalg.\n"
 "                       Denne APT har »Super Cow Powers«.\n"
 
-#: cmdline/apt-helper.cc:35
-#, fuzzy
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 msgid "Must specify at least one pair url/filename"
-msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
+msgstr "Du skal angive mindst et par i form af adresse/filnavn"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
-msgstr ""
+msgstr "Kunne ikke hente pakkerne"
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
+#, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -648,9 +651,19 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
+"Brug: apt-helper [tilvalg] kommando\n"
+"      apt-helper [tilvalg] download-file uri target-path\n"
+"\n"
+"apt-helper er et internt hjælpeprogram for apt\n"
+"\n"
+"Kommandoer:\n"
+"   download-file - hent den angivne uri til mål-sti\n"
+"\n"
+"                       Dette APT-hjælpeprogram har Super Meep Powers.\n"
 
 #: cmdline/apt-mark.cc:68
 #, c-format
@@ -677,8 +690,9 @@ msgstr "%s var allerede sat i bero.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s var allerede ikke i bero.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventede på %s, men den var der ikke"
@@ -698,7 +712,6 @@ msgid "Executing dpkg failed. Are you root?"
 msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?"
 
 #: cmdline/apt-mark.cc:392
-#, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -733,6 +746,11 @@ msgstr ""
 "Kommandoer:\n"
 "   auto - Marker de givne pakker som automatisk installeret\n"
 "   manual - Marker de givne pakker som manuelt installeret\n"
+"   hold - Marker en pakke som tilbageholdt\n"
+"   unhold - Fjern tilbageholdelse på pakke\n"
+"   showauto - Vis listen over automatisk installerede pakker\n"
+"   showmanual - Vis listen over manuelt installerede pakker\n"
+"   showhold - Vis listen over tilbageholdte pakker\n"
 "\n"
 "Tilvalg:\n"
 "  -h  Denne hjælpetekst.\n"
@@ -746,7 +764,6 @@ msgstr ""
 "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
 
 #: cmdline/apt.cc:47
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -776,8 +793,13 @@ msgstr ""
 " show - vis pakkedetaljer\n"
 "\n"
 " update - opdater listen over tilgængelige pakker\n"
+"\n"
 " install - installer pakker\n"
-" upgrade - opgrader systemets pakker\n"
+" remove - fjern pakker\n"
+"\n"
+" upgrade - opgradere systemet ved at installere/opgradere pakker\n"
+" full-upgrade - opgradere systemet ved at fjerne/installere/opgradere "
+"pakker\n"
 "\n"
 " edit-sources - rediger source-informationsfilen (kildefilen)\n"
 
@@ -907,7 +929,7 @@ msgstr "Kunne ikke oprette sokkel"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislykkedes"
 
@@ -953,7 +975,7 @@ msgstr "Tidsudløb på datasokkel-forbindelse"
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
@@ -1087,144 +1109,230 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Tomme filer kan ikke være gyldige arkiver"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Fejl ved læsning fra server"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Valg mislykkedes"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Tidsudløb på forbindelsen"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Afventer hoveder"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Ugyldig linje i hovedet"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-serveren sendte et ugyldigt svarhovede"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http-serveren sendte et ugyldigt Content-Length-hovede"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-serveren sendte et ugyldigt Content-Range-hovede"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr ""
 "Denne http-servere har fejlagtig understøttelse af intervaller (»ranges«)"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Ukendt datoformat"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Havde "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Henter:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ignorerer "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Fejl "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Arbejder]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Medieskift: Indsæt disken med navnet\n"
+" »%s«\n"
+"i drevet »%s« og tryk retur\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr "Sortering"
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Autentifikationsadvarsel tilsidesat.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Nogle pakker kunne ikke autentificeres"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Installér disse pakker uden verifikation?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Kunne ikke hente %s %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern fejl. Sortering blev ikke fuldført"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Ja, gør som jeg siger!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1235,19 +1343,19 @@ msgstr ""
 "For at fortsætte, skal du skrive »%s«\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Afbryder."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Nedhentningen af filer mislykkedes"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1255,19 +1363,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:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing og medieskift understøttes endnu ikke"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Kunne ikke rette manglende pakker."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Afbryder installationen."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1281,17 +1389,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1309,15 +1417,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern fejl. AutoRemover ødelagde noget"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1328,7 +1436,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1337,7 +1445,7 @@ 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:518
+#: apt-private/private-install.cc:519
 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."
@@ -1355,7 +1463,7 @@ msgstr ""
 "Uopfyldte afhængigheder. Prøv »apt-get -f install« uden pakker (eller angiv "
 "en løsning)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1366,203 +1474,193 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Følgende yderligere pakker vil blive installeret:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Foreslåede pakker:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Anbefalede pakker:"
 
-#: apt-private/private-install.cc:815
-#, fuzzy, c-format
+#: apt-private/private-install.cc:825
+#, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
+msgstr ""
+"Springer over %s, den er allerede installeret og opgradering er ikke "
+"angivet.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
+"Springer over %s, den er ikke installeret og der blev kun anmodt om "
+"opgraderinger.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
+msgstr "Geninstallation af %s er ikke muligt, pakken kan ikke hentes.\n"
 
-#: apt-private/private-install.cc:836
-#, fuzzy, c-format
+#: apt-private/private-install.cc:846
+#, c-format
 msgid "%s is already the newest version.\n"
-msgstr "%s var allerede sat i bero.\n"
+msgstr "%s er allerede den nyeste version.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "Valgt version »%s« (%s) for »%s«\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Valgt version »%s« (%s) for »%s« på grund af »%s«\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet. Mente du »%s«?\n"
 
-#: apt-private/private-install.cc:937
-#, fuzzy, c-format
+#: apt-private/private-install.cc:947
+#, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
+msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet\n"
 
 # måske visning, kategorisering
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr "Listing"
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, 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] ""
+"Der er %i yderlig version. Brug venligst kontakten »-a« til at se den."
 msgstr[1] ""
+"Der er %i yderligere versioner. Brug venligst kontakten »-a« til at se dem."
 
-#: 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
-msgstr ""
+msgstr "ukendt"
 
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
+#: apt-private/private-output.cc:265
+#, c-format
 msgid "[installed,upgradable to: %s]"
-msgstr "installeret,kan opgraderes til: "
+msgstr "[installeret,kan opgraderes til: %s]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 msgid "[installed,local]"
 msgstr "[Installeret,lokalt]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr "[installeret,kan auto-fjernes]"
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 msgid "[installed,automatic]"
 msgstr "[Installeret,automatisk]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 msgid "[installed]"
 msgstr "[Installeret]"
 
-#: apt-private/private-output.cc:248
-#, fuzzy, c-format
+#: apt-private/private-output.cc:277
+#, c-format
 msgid "[upgradable from: %s]"
-msgstr "[kan opgraderes fra: "
+msgstr "[kan opgraderes fra: %s]"
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr "[residual-konfig]"
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uopfyldte afhængigheder:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installeret"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s forventes installeret"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "men den kan ikke installeres"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "men det er en virtuel pakke"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "men den er ikke installeret"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "men den bliver ikke installeret"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " eller"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uopfyldte afhængigheder:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Følgende NYE pakker vil blive installeret:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Følgende pakker vil blive AFINSTALLERET:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Følgende pakker er blevet holdt tilbage:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Følgende pakker vil blive opgraderet:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Følgende pakker vil blive NEDGRADERET:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Følgende tilbageholdte pakker vil blive ændret:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (grundet %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1570,27 +1668,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu opgraderes, %lu nyinstalleres, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu geninstalleres, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderes, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
@@ -1599,7 +1697,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[J/n]"
 
@@ -1607,36 +1705,28 @@ msgstr "[J/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "Fuldtekst-søgning"
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1644,45 +1734,14 @@ 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] ""
+"Der er %i yderligere post. Brug venligst kontakten »-a« for at se den."
 msgstr[1] ""
+"Der er %i yderligere poster. Brug venligst kontakten »-a« for at se dem."
 
 #: apt-private/private-show.cc:163
 msgid "not a real package (virtual)"
 msgstr "ikke en reel pakke (virtuel)"
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Autentifikationsadvarsel tilsidesat.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Nogle pakker kunne ikke autentificeres"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Installér disse pakker uden verifikation?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Kunne ikke hente %s %s\n"
-
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1693,73 +1752,46 @@ msgstr "Kunne ikke fortolke %s. Rediger igen? "
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«."
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
-msgstr "Fuldtekst-søgning"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "»update«-kommandoen benytter ingen parametre"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i pakke kan opgraderes. Kør »apt list --upgradable« for at se den.\n"
+msgstr[1] ""
+"%i pakker kan opgraderes. Kør »apt list --upgradable« for at se dem.\n"
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr "Alle pakker er opdateret."
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Færdig"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Havde "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Henter:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ignorerer "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Fejl "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Arbejder]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Medieskift: Indsæt disken med navnet\n"
-" »%s«\n"
-"i drevet »%s« og tryk retur\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunne ikke læse %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1836,36 +1868,427 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sammenfletter tilgængelighedsoplysninger"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode kaldt med endnu forbundet knude"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Kunne ikke finde hash-element!"
+#: cmdline/apt-extracttemplates.cc:254
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Kunne ikke mkstemp %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Kunne ikke allokere omrokering"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kunne ikke skrive til %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Intern fejl i AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Kan ikke finde debconfs version. Er debconf installeret?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Pakkeudvidelseslisten er for lang"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Fejl under behandling af mappen %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Kildeudvidelseslisten er for lang"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Fejl under skrivning af hovedet til indholdsfil"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dobbelt tilføjelse af omrokering %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Fejl under behandling af indhold %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Ingen valg passede"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Dobbelt opsætningsfil %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Visse filer mangler i pakkefilgruppen »%s«"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB var ødelagt, filen omdøbt til %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB er gammel, forsøger at opgradere %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Kunne ikke åbne DB-filen %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Kunne ikke finde %s"
+
+#: ftparchive/cachedb.cc:332
+msgid "Failed to read .dsc"
+msgstr "Kunne ikke læse .dsc"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen kontrolindgang"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Arkivet havde intet package-felt"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s har ingen tvangs-post\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
+
+#: ftparchive/writer.cc:706
+#, 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:710
+#, 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:351 ftparchive/contents.cc:382
+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
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Ugyldig overskrivning af %s-linjen %llu (%s)"
+
+#: 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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Kunne ikke omdøbe %s til %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1891,17 +2314,6 @@ msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s"
 msgid "The diversion path is too long"
 msgstr "Omrokeringsstien er for lang"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1930,30 +2342,36 @@ msgstr "File %s/%s overskriver filen i pakken %s"
 msgid "Unable to stat %s"
 msgstr "Kunne ikke finde %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode kaldt med endnu forbundet knude"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Kunne ikke lukke filen %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Kunne ikke finde hash-element!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Kunne ikke allokere omrokering"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Intern fejl i AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Intern fejl, kunne ikke finde elementet %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dobbelt tilføjelse af omrokering %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ikke-tolkbar kontrolfil"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Dobbelt opsætningsfil %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -2001,197 +2419,52 @@ msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukendt TAR-hovedtype %u, element %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr "Status: [%3i%%]"
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Kører dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Pakkesystemet »%s« understøttes ikke"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Kunne ikke bestemme en passende pakkesystemtype"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Skrev %i poster.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Skrev %i poster med %i manglende filer.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Skrev %i poster med %i ikke-trufne filer\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Intern fejl, kunne ikke finde elementet %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Kan ikke finde godkendelsesregistrering for: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Ikke-tolkbar kontrolfil"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hashsum stemmer ikke: %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/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«"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Tomt pakke-mellemlager"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Pakke-mellemlagerets fil er ødelagt"
-
-#: 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:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Pakke-mellemlagerets fil er ødelagt, den er for lille"
+msgid "List directory %spartial is missing."
+msgstr "Listemappen %spartial mangler."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Denne APT understøtter ikke versionssystemet »%s«"
-
-#: 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:321
-msgid "Depends"
-msgstr "Afhængigheder"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Præ-afhængigheder"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Foreslåede"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Anbefalede"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Konflikter"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Erstatter"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Overflødiggør"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Ødelægger"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Forbedringer"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "vigtig"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "krævet"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standard"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "frivillig"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "ekstra"
+msgid "Archives directory %spartial is missing."
+msgstr "Arkivmappen %spartial mangler."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metodedriveren %s blev ikke fundet."
+msgid "Unable to lock directory %s"
+msgstr "Kunne ikke låse mappen %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startede ikke korrekt"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Indeksfiler af typen »%s« understøttes ikke"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Kunne ikke åbne StateFile %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Henter fil %li ud af %li (%s tilbage)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Kunne ikke skrive den midlertidige StateFile %s"
+msgid "Retrieving file %li of %li"
+msgstr "Henter fil %li ud af %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2210,7 +2483,7 @@ msgstr "Størrelsen stemmer ikke"
 msgid "Invalid file format"
 msgstr "Ugyldigt filformat"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2219,17 +2492,17 @@ msgstr ""
 "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
 "punkt eller forkert udformet fil)"
 
-#: apt-pkg/acquire-item.cc:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2238,12 +2511,12 @@ msgstr ""
 "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
 "arkiv vil ikke blive anvendt."
 
-#: apt-pkg/acquire-item.cc:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2253,12 +2526,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:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fejl: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2267,179 +2540,124 @@ 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, 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/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: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
+#: apt-pkg/acquire-worker.cc:116
 #, 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: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: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."
+msgid "The method driver %s could not be found."
+msgstr "Metodedriveren %s blev ikke fundet."
 
-#: 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/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Er pakken %s installeret?"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startede ikke korrekt"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, 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"
+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/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunne ikke finde kildepakkelisten %s"
+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/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/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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samler filudbud"
+#: 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kunne ikke skrive til %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/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO-fejl ved gemning af kilde-mellemlageret"
+#: 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«"
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Leverandørblok %s inderholder intet fingeraftryk"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Listen med kilder kunne ikke læses."
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listemappen %spartial mangler."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Udgaven »%s« for »%s« blev ikke fundet"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkivmappen %spartial mangler."
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versionen »%s« for »%s« blev ikke fundet"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Kunne ikke låse mappen %s"
+msgid "Couldn't find task '%s'"
+msgstr "Kunne ikke finde opgaven »%s«"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Henter fil %li ud af %li (%s tilbage)"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:615
 #, c-format
-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/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"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Kunne ikke finde nogle pakker med glob »%s«"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Kunne ikke finde %s."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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"
+"Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke "
+"har nogen af dem"
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, 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"
+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/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 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:503 apt-pkg/packagemanager.cc:533
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Kunne ikke åbne filen »%s«. "
+"Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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«."
+"Kan ikke vælge installeret version fra pakke %s da den ikke er installeret"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2523,55 +2741,86 @@ msgstr "Skriver ny kildeliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Denne disk har følgende kildeliste-indgange:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Kunne ikke finde %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Opbygger afhængighedstræ"
 
-#: 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversioner"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "Kunne ikke åbne StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Kunne ikke skrive den midlertidige StateFile %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Send scenarie til problemløser"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Send forespørgsel til problemløser"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Forbered for modtagelse af løsning"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Kør ekstern problemløser"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Kunne ikke tolke pakkefilen %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Kunne ikke tolke pakkefilen %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Skrev %i poster med %i manglende filer.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Skrev %i poster med %i ikke-trufne filer\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Kan ikke finde godkendelsesregistrering for: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hashsum stemmer ikke: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2598,10 +2847,223 @@ msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Pakkesystemet »%s« understøttes ikke"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Kunne ikke bestemme en passende pakkesystemtype"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr "Status: [%3i%%]"
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Kører dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Kunne ikke åbne filen »%s«. "
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Tomt pakke-mellemlager"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Pakke-mellemlagerets fil er ødelagt"
+
+#: 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: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: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:179
+msgid "The package cache was built for a different architecture"
+msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Afhængigheder"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Præ-afhængigheder"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Foreslåede"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Anbefalede"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Konflikter"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Erstatter"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Overflødiggør"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Ødelægger"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Forbedringer"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "vigtig"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "krævet"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standard"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "frivillig"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "ekstra"
+
+#: 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: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: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: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: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: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: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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kunne ikke finde kildepakkelisten %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 "Indlæser pakkelisterne"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samler filudbud"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Indeksfiler af typen »%s« understøttes ikke"
+
+#: 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 ""
+"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/sourcelist.cc:127
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
+msgstr "Ugyldig stanza %u i kildelisten %s (tolkning af URI)"
 
 #: apt-pkg/sourcelist.cc:170
 #, c-format
@@ -2669,238 +3131,146 @@ 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/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:492
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versionen »%s« for »%s« blev ikke fundet"
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen »%s« er ukendt på stanza %u i kildelisten %s"
 
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Kunne ikke finde opgaven »%s«"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
+msgid "Unable to parse package file %s (1)"
+msgstr "Kunne ikke tolke pakkefilen %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Kunne ikke tolke pakkefilen %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke "
-"har nogen af dem"
+"Nogle indeksfiler kunne ikke hentes. De er blevet ignoreret eller de gamle "
+"bruges i stedet."
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Leverandørblok %s inderholder intet fingeraftryk"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Kunne ikke finde monteringspunktet %s"
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Kunne ikke finde cdrommen"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "Installerer %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Kommandolinjetilvalget »%c« [fra %s] kendes ikke."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "Sætter %s op"
+msgid "Command line option %s is not understood"
+msgstr "Kommandolinjetilvalget %s blev ikke forstået"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "Fjerner %s"
+msgid "Command line option %s is not boolean"
+msgstr "Kommandolinjetilvalget %s er ikke boolsk"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "Fjerner %s helt"
+msgid "Option %s requires an argument."
+msgstr "Tilvalget %s kræver et parameter."
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Bemærker forsvinding af %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =<værdi>."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Kører førinstallationsudløser %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Tilvalget %s kræver et heltalligt parameter, ikke »%s«"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Mappe »%s« mangler"
+msgid "Option '%s' is too long"
+msgstr "Tilvalget »%s« er for langt"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Kunne ikke åbne filen »%s«"
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s blev ikke forstået, prøv med »true« eller »false«."
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "Klargør %s"
+msgid "Invalid operation %s"
+msgstr "Ugyldig handling %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "Pakker %s ud"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Ukendt type-forkortelse: »%c«"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Gør klar til at sætte %s op"
+msgid "Opening configuration file %s"
+msgstr "Ã…bner konfigurationsfilen %s"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "Installerede %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaksfejl %s:%u: Blokken starter uden navn."
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Gør klar til afinstallation af %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaksfejl %s:%u: Forkert udformet mærke"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "Fjernede %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaksfejl %s:%u: Overskydende affald efter værdien"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Gør klar til at fjerne %s helt"
+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/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "Fjernede %s helt"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Syntaksfejl %s:%u: For mange sammenkædede inkluderinger"
 
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid "Can not write log (%s)"
-msgstr "Kan ikke skrive log (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1069
-msgid "Is /dev/pts mounted?"
-msgstr "Er /dev/pts monteret?"
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr "Er standardud en terminal?"
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "Handling blev afbrudt før den kunne afsluttes"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "afhængighedsproblemer - efterlader ukonfigureret"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
-"opfølgningsfejl fra en tidligere fejl."
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-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:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
-"hukommelsesfejl"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
-"system"
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-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"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaksfejl %s:%u: Inkluderet herfra"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv »%s«"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?"
+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"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, 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:128
-msgid "Not locked"
-msgstr "Ikke låst"
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3015,54 +3385,11 @@ msgstr "Fejl ved frigivelse af filen %s"
 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%%"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Det valgte %s blev ikke fundet"
+msgid "No keyring installed in %s."
+msgstr "Ingen nøglering installeret i %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3120,518 +3447,230 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Command line option %s is not understood"
-msgstr "Kommandolinjetilvalget %s blev ikke forstået"
+msgid "%c%s... Error!"
+msgstr "%c%s... Fejl!"
 
-#: apt-pkg/contrib/cmndline.cc:168
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Kommandolinjetilvalget %s er ikke boolsk"
+msgid "%c%s... Done"
+msgstr "%c%s... Færdig"
 
-#: 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/progress.cc:181
+msgid "..."
+msgstr "..."
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =<værdi>."
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Tilvalget %s kræver et heltalligt parameter, ikke »%s«"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Tilvalget »%s« er for langt"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s blev ikke forstået, prøv med »true« eller »false«."
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Pakkeudvidelseslisten er for lang"
+msgid "%lis"
+msgstr "%lis"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Fejl under behandling af mappen %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Kildeudvidelseslisten er for lang"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Fejl under skrivning af hovedet til indholdsfil"
+msgid "Selection %s not found"
+msgstr "Det valgte %s blev ikke fundet"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Fejl under behandling af indhold %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:841
-msgid "No selections matched"
-msgstr "Ingen valg passede"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Visse filer mangler i pakkefilgruppen »%s«"
+"Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?"
 
-#: ftparchive/cachedb.cc:65
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB var ødelagt, filen omdøbt til %s.old"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB er gammel, forsøger at opgradere %s"
-
-#: ftparchive/cachedb.cc:94
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Kunne ikke åbne DB-filen %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Kunne ikke »readlink« %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen kontrolindgang"
-
-#: ftparchive/cachedb.cc:594
-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"
+"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."
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Trævandring mislykkedes"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Ikke låst"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "Kunne ikke åbne %s"
+msgid "Installing %s"
+msgstr "Installerer %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Configuring %s"
+msgstr "Sætter %s op"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Kunne ikke »readlink« %s"
+msgid "Removing %s"
+msgstr "Fjerner %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Kunne ikke frigøre %s"
+msgid "Completely removing %s"
+msgstr "Fjerner %s helt"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Kunne ikke lænke %s til %s"
+msgid "Noting disappearance of %s"
+msgstr "Bemærker forsvinding af %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Nåede DeLink-begrænsningen på %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arkivet havde intet package-felt"
+msgid "Running post-installation trigger %s"
+msgstr "Kører førinstallationsudløser %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen tvangs-post\n"
+msgid "Directory '%s' missing"
+msgstr "Mappe »%s« mangler"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
+msgid "Could not open file '%s'"
+msgstr "Kunne ikke åbne filen »%s«"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
+msgid "Preparing %s"
+msgstr "Klargør %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Kunne ikke allokere hukommelse"
+msgid "Unpacking %s"
+msgstr "Pakker %s ud"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, 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"
+msgid "Preparing to configure %s"
+msgstr "Gør klar til at sætte %s op"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Kunne ikke læse gennemtvangsfilen %s"
+msgid "Installed %s"
+msgstr "Installerede %s"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Ugyldig gennemtvangs %s-linje %llu #1"
+msgid "Preparing for removal of %s"
+msgstr "Gør klar til afinstallation af %s"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Ugyldig gennemtvangs %s-linje %llu #2"
+msgid "Removed %s"
+msgstr "Fjernede %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Ugyldig gennemtvangs %s-linje %llu #3"
+msgid "Preparing to completely remove %s"
+msgstr "Gør klar til at fjerne %s helt"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Ukendt komprimeringsalgoritme »%s«"
+msgid "Completely removed %s"
+msgstr "Fjernede %s helt"
 
-#: ftparchive/multicompress.cc:103
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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*"
+msgid "Can not write log (%s)"
+msgstr "Kan ikke skrive log (%s)"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Kunne ikke spalte"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr "Er /dev/pts monteret?"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimer barn"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr "Er standardud en terminal?"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Intern fejl. Kunne ikke oprette %s"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "Handling blev afbrudt før den kunne afsluttes"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO til underproces/fil mislykkedes"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Kunne ikke læse under beregning af MD5"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "afhængighedsproblemer - efterlader ukonfigureret"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem under aflænkning af %s"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
+"opfølgningsfejl fra en tidligere fejl."
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1700
 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"
+"No apport report written because the error message indicates a disk full "
+"error"
 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"
+"Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Ukendt pakkeindgang!"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
+"hukommelsesfejl"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 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"
+"Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
+"system"
+
+#: apt-pkg/deb/dpkgpm.cc:1742
+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"
+
+#~ msgid "ioctl(TIOCGWINSZ) failed"
+#~ msgstr "ioctl(TIOCGWINSZ) mislykkedes"
+
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Intern fejl, opgradering blev afbrudt"
 
 #~ 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 ac9ebd3df..b5e05bd72 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # German messages for the apt suite.
 # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
-# Holger Wansing <linux@wansing-online.de>, 2008, 2009, 2010, 2012.
+# Holger Wansing <linux@wansing-online.de>, 2008, 2009, 2010, 2012, 2014.
 # Jens Seidel <jensseidel@users.sf.net>, 2008.
 # Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004, 2006.
 # Rüdiger Kuhlmann <Uebersetzung@ruediger-kuhlmann.de>, 2002.
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.2\n"
+"Project-Id-Version: apt 1.0.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2012-06-27 10:55+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\n"
+"PO-Revision-Date: 2014-06-09 22:42+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
 "Language: \n"
@@ -99,78 +99,78 @@ msgstr "Gesamtmenge an Speicher: "
 msgid "Package file %s is out of sync."
 msgstr "Paketdatei %s ist nicht synchronisiert."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Sie müssen mindestens ein Suchmuster angeben"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Paket %s kann nicht gefunden werden."
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Paketdateien:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Mit Pinning verwaltete Pakete:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(nicht gefunden)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Installiert: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Installationskandidat: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(keine)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Paket-Pinning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Versionstabelle:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -265,6 +265,13 @@ msgid ""
 "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
 "mount point."
 msgstr ""
+"Ãœber den Standard-Einbindungspunkt konnte automatisch keine CD-ROM erkannt "
+"werden.\n"
+"Sie könnten die Option --cdrom ausprobieren, um den Einbindungspunkt der CD-"
+"ROM festzulegen.\n"
+"Weitere Informationen über automatische Erkennung von CD-ROMs und "
+"Einbindungspunkte\n"
+"bekommen Sie mit »man apt-cdrom«."
 
 #: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -305,19 +312,19 @@ msgstr ""
 "  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-get.cc:245
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package for architecture '%s'"
-msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
+msgstr "Es kann kein Paket für Architektur »%s« gefunden werden"
 
 #: cmdline/apt-get.cc:327
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package '%s' with version '%s'"
-msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
+msgstr "Es kann kein Paket »%s« mit Version »%s« gefunden werden"
 
 #: cmdline/apt-get.cc:330
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package '%s' with release '%s'"
-msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
+msgstr "Es kann kein Paket »%s« in der Veröffentlichung »%s« gefunden werden"
 
 #: cmdline/apt-get.cc:367
 #, c-format
@@ -325,9 +332,9 @@ msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Als Quellpaket wird »%s« statt »%s« gewählt.\n"
 
 #: cmdline/apt-get.cc:423
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find version '%s' of package '%s'"
-msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert."
+msgstr "Es kann keine Version »%s« des Pakets »%s« gefunden werden"
 
 #: cmdline/apt-get.cc:454
 #, c-format
@@ -335,7 +342,7 @@ msgid "Couldn't find package %s"
 msgstr "Paket %s konnte nicht gefunden werden"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s wurde als manuell installiert festgelegt.\n"
@@ -367,7 +374,7 @@ msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
 "sollen."
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Quellpaket für %s kann nicht gefunden werden."
@@ -400,7 +407,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Freier Platz in %s konnte nicht bestimmt werden."
@@ -433,7 +440,7 @@ msgstr "Quelle %s wird heruntergeladen.\n"
 msgid "Failed to fetch some archives."
 msgstr "Einige Archive konnten nicht heruntergeladen werden."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 
@@ -442,32 +449,32 @@ msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -476,18 +483,18 @@ msgstr ""
 "Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung "
 "finden Sie unter apt.conf(5) APT::Architectures."
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s hat keine Bauabhängigkeiten.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -496,7 +503,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:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -505,14 +512,14 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
 "gefunden werden kann."
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -522,7 +529,7 @@ msgstr ""
 "Installationskandidaten für das Paket %s die Versionsanforderungen nicht "
 "erfüllen kann."
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -531,30 +538,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Änderungsprotokoll (Changelog) für %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -649,18 +656,20 @@ msgstr ""
 "bezüglich weitergehender Informationen und Optionen.\n"
 "                                    Dieses APT hat Super-Kuh-Kräfte.\n"
 
-#: cmdline/apt-helper.cc:35
-#, fuzzy
-msgid "Must specify at least one pair url/filename"
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
 msgstr ""
-"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
-"sollen."
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:49
+msgid "Must specify at least one pair url/filename"
+msgstr "Es muss mindestens ein URL/Dateinamen-Paar angegeben werden"
+
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
-msgstr ""
+msgstr "Herunterladen fehlgeschlagen"
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
+#, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -669,9 +678,19 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
+"Aufruf: apt-helper [Optionen] Befehl\n"
+"        apt-helper [Optionen] download-file uri zielpfad\n"
+"\n"
+"apt-helper ist ein internes Hilfsprogramm für apt.\n"
+"\n"
+"Befehle:\n"
+"   download-file - den angegebenen URI in den Zielpfad herunterladen\n"
+"\n"
+"             Dieses APT-Hilfsprogramm hat Super-Road-Runner-Kräfte.\n"
 
 #: cmdline/apt-mark.cc:68
 #, c-format
@@ -699,8 +718,9 @@ msgstr "%s wurde bereits auf Halten gesetzt.\n"
 msgid "%s was already not hold.\n"
 msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
@@ -720,7 +740,6 @@ msgid "Executing dpkg failed. Are you root?"
 msgstr "Ausführen von dpkg fehlgeschlagen. Sind Sie root?"
 
 #: cmdline/apt-mark.cc:392
-#, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -755,6 +774,11 @@ msgstr ""
 "Befehle:\n"
 "   auto   – das angegebene Paket als »Automatisch installiert« markieren\n"
 "   manual – das angegebene Paket als »Manuell installiert« markieren\n"
+"   hold - ein Paket als zurückgehalten markieren\n"
+"   unhold - ein Paket als nicht mehr zurückgehalten markieren\n"
+"   showauto - eine Liste aller automatisch installierten Pakete anzeigen\n"
+"   showmanual - eine Liste aller manuell installierten Pakete anzeigen\n"
+"   showhold - eine Liste aller zurückgehaltenen Pakete anzeigen\n"
 "\n"
 "Optionen:\n"
 "  -h   dieser Hilfetext\n"
@@ -765,7 +789,7 @@ msgstr ""
 "  -c=? Diese Konfigurationsdatei benutzen\n"
 "  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 "Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n"
-"weitergehender Informationen und Optionen."
+"weitergehender Informationen."
 
 #: cmdline/apt.cc:47
 msgid ""
@@ -788,6 +812,26 @@ msgid ""
 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""
+"Aufruf: apt [Optionen] Befehl\n"
+"\n"
+"Befehlszeilen-Schnittstelle (CLI) für apt.\n"
+"Basis-Befehle: \n"
+" list - Pakete basierend auf dem Paketnamen auflisten\n"
+" search - Paketbeschreibungen durchsuchen\n"
+" show - Paketdetails anzeigen\n"
+"\n"
+" update - Liste verfügbarer Pakete aktualisieren\n"
+"\n"
+" install - Pakete installieren\n"
+" remove  - Pakete entfernen\n"
+"\n"
+" upgrade - das System durch Installation/Aktualisierung der Pakete "
+"hochrüsten\n"
+" full-upgrade - das System durch Entfernung/Installation/Aktualisierung der "
+"Pakete\n"
+"                vollständig hochrüsten\n"
+"\n"
+" edit-sources - die Datei für die Paketquellen bearbeiten\n"
 
 #: methods/cdrom.cc:203
 #, c-format
@@ -918,7 +962,7 @@ msgstr "Socket konnte nicht erzeugt werden."
 msgid "Could not connect data socket, connection timed out"
 msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden."
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
@@ -966,7 +1010,7 @@ msgstr "Zeitüberschreitung bei Datenverbindungsaufbau"
 msgid "Unable to accept connection"
 msgstr "Verbindung konnte nicht angenommen werden."
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem bei Bestimmung des Hashwertes einer Datei"
 
@@ -1043,9 +1087,9 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
 
 #: methods/connect.cc:209
-#, fuzzy, c-format
+#, c-format
 msgid "System error resolving '%s:%s'"
-msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
+msgstr "Systemfehler bei der Auflösung von »%s:%s«"
 
 #: methods/connect.cc:211
 #, c-format
@@ -1081,6 +1125,8 @@ msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
+"Durch Clearsign signierte Datei ist nicht gültig, »%s« erhalten (erfordert "
+"das Netzwerk eine Authentifizierung?)"
 
 #: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
@@ -1103,96 +1149,186 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Leere Dateien können kein gültiges Archiv sein."
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben in Datei"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Zeitüberschreitung bei Verbindung"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Warten auf Kopfzeilen"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Ungültige Kopfzeile"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Vom HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt."
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr ""
 "Teilweise Dateiübertragung wird vom HTTP-Server nur fehlerhaft unterstützt."
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Unbekanntes Datumsformat"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
-msgid "Sorting"
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "OK   "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Holen: "
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Fehl "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Wird verarbeitet]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
 msgstr ""
+"Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n"
+" »%s«\n"
+"in Laufwerk »%s« ein und drücken Sie die Eingabetaste (Enter).\n"
 
-#: apt-private/private-install.cc:81
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"
+msgstr "Sortierung"
+
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Authentifizierungswarnung überstimmt.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Einige Pakete konnten nicht authentifiziert werden."
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Diese Pakete ohne Überprüfung installieren?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interner Fehler, Anordnung beendete nicht"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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 "
@@ -1200,52 +1336,48 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Ja, tue was ich sage!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1256,19 +1388,19 @@ msgstr ""
 "Zum Fortfahren geben Sie bitte »%s« ein.\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Abbruch."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortfahren?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Einige Dateien konnten nicht heruntergeladen werden."
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1276,19 +1408,19 @@ msgstr ""
 "Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get "
 "update« ausführen oder mit »--fix-missing« probieren?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Fehlende Pakete konnten nicht korrigiert werden."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Installation abgebrochen."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1302,16 +1434,16 @@ msgstr[1] ""
 "Die folgenden Pakete verschwanden von Ihrem System, da alle\n"
 "Dateien von anderen Paketen überschrieben wurden:"
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1330,16 +1462,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interner Fehler, AutoRemover hat etwas beschädigt."
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1352,7 +1484,7 @@ msgstr[1] ""
 "Die folgenden Pakete wurden automatisch installiert und werden nicht mehr "
 "benötigt:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1362,7 +1494,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 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."
@@ -1380,7 +1512,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:628
+#: apt-private/private-install.cc:638
 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"
@@ -1392,214 +1524,200 @@ msgstr ""
 "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n"
 "nicht erstellt wurden oder Incoming noch nicht verlassen haben."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Beschädigte Pakete"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s wird übersprungen; es ist schon installiert und ein Upgrade ist nicht "
 "angefordert.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s wird übersprungen; es ist nicht installiert und lediglich Upgrades sind "
 "angefordert.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Erneute Installation von %s ist nicht möglich,\n"
 "es kann nicht heruntergeladen werden.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ist schon die neueste Version.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Version »%s« (%s) für »%s« gewählt.\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Version »%s« (%s) für »%s« gewählt aufgrund von »%s«.\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Paket »%s« ist nicht installiert, wird also auch nicht entfernt. Meinten Sie "
 "»%s«?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
-msgstr ""
+msgstr "Auflistung"
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, 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] ""
+"Es gibt %i zusätzliche Version. Bitte verwenden Sie die Option »-a«, um sie "
+"anzuzeigen."
 msgstr[1] ""
+"Es gibt %i zusätzliche Versionen. Bitte verwenden Sie die Option »-a«, um "
+"sie anzuzeigen."
 
-#: 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
-msgstr ""
+msgstr "unbekannt"
 
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
+#: apt-private/private-output.cc:265
+#, c-format
 msgid "[installed,upgradable to: %s]"
-msgstr " [Installiert]"
+msgstr " [Installiert,aktualisierbar auf: %s]"
 
-#: apt-private/private-output.cc:237
-#, fuzzy
+#: apt-private/private-output.cc:268
 msgid "[installed,local]"
-msgstr " [Installiert]"
+msgstr " [Installiert,lokal]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
-msgstr ""
+msgstr "[installiert,automatisch-entfernbar]"
 
-#: apt-private/private-output.cc:242
-#, fuzzy
+#: apt-private/private-output.cc:272
 msgid "[installed,automatic]"
-msgstr " [Installiert]"
+msgstr " [Installiert,automatisch]"
 
-#: apt-private/private-output.cc:244
-#, fuzzy
+#: apt-private/private-output.cc:274
 msgid "[installed]"
-msgstr " [Installiert]"
+msgstr " [installiert]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
-msgstr ""
+msgstr "[aktualisierbar von: %s]"
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
+msgstr "[Konfiguration-verbleibend]"
 
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "aber %s ist installiert"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "aber %s soll installiert werden"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ist aber nicht installierbar"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "ist aber ein virtuelles Paket"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "ist aber nicht installiert"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "soll aber nicht installiert werden"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " oder"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Die folgenden NEUEN Pakete werden installiert:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Die folgenden Pakete werden ENTFERNT:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Die folgenden Pakete sind zurückgehalten worden:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (wegen %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1607,27 +1725,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualisiert, %lu neu installiert, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu erneut installiert, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu durch eine ältere Version ersetzt, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nicht vollständig installiert oder entfernt.\n"
@@ -1636,7 +1754,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[J/n]"
 
@@ -1644,36 +1762,28 @@ msgstr "[J/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "Volltextsuche"
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1681,124 +1791,65 @@ 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] ""
+"Es gibt %i zusätzlichen Eintrag. Bitte verwenden Sie die Option »-a«, um ihn "
+"anzuzeigen."
 msgstr[1] ""
+"Es gibt %i zusätzliche Einträge. Bitte verwenden Sie die Option »-a«, um sie "
+"anzuzeigen."
 
 #: apt-private/private-show.cc:163
 msgid "not a real package (virtual)"
-msgstr ""
-
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Authentifizierungswarnung überstimmt.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Einige Pakete konnten nicht authentifiziert werden."
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Diese Pakete ohne Überprüfung installieren?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Fehlschlag beim Holen von %s  %s\n"
+msgstr "kein reales Paket (virtuell)"
 
 #: apt-private/private-sources.cc:58
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to parse %s. Edit again? "
-msgstr "%s konnte nicht in %s umbenannt werden."
+msgstr "Verarbeitung von %s fehlgeschlagen. Erneut bearbeiten?"
 
 #: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
+"Ihre »%s«-Datei wurde verändert, bitte führen Sie »apt-get update« aus."
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Der Befehl »update« akzeptiert keine Argumente."
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Fertig"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "OK   "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Holen: "
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Fehl "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Wird verarbeitet]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n"
-" »%s«\n"
-"in Laufwerk »%s« ein und drücken Sie die Eingabetaste (Enter).\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s kann nicht gelesen werden."
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1819,9 +1870,9 @@ msgid "Can not read mirror file '%s'"
 msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden."
 
 #: methods/mirror.cc:315
-#, fuzzy, c-format
+#, c-format
 msgid "No entry found in mirror file '%s'"
-msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden."
+msgstr "Kein Eintrag in Spiegeldatei »%s« gefunden"
 
 #: methods/mirror.cc:445
 #, c-format
@@ -1875,36 +1926,437 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Verfügbare Informationen werden zusammengeführt."
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Hash-Element konnte nicht gefunden werden!"
+#: cmdline/apt-extracttemplates.cc:254
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "mkstemp %s nicht möglich"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Umleitung konnte nicht reserviert werden."
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Schreiben nach %s nicht möglich"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Interner Fehler in »AddDiversion«"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr ""
+"Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Paketerweiterungsliste ist zu lang."
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Fehler beim Verarbeiten von Verzeichnis %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Quellerweiterungsliste ist zu lang."
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Doppelte Hinzufügung der Umleitung %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Fehler beim Verarbeiten der Inhalte %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Keine Auswahl traf zu"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Doppelte Konfigurationsdatei %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«."
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern."
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s mit »stat« abfragen fehlgeschlagen"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "readlink von %s fehlgeschlagen"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Archiv hat keinen Steuerungsdatensatz."
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Archiv hatte kein Feld »package«"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s-Betreuer ist %s und nicht %s.\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
+
+#: ftparchive/writer.cc:710
+#, 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:351 ftparchive/contents.cc:382
+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
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Missgestaltetes Override %s Zeile %llu (%s)"
+
+#: 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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s konnte nicht in %s umbenannt werden."
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1930,17 +2382,6 @@ msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s"
 msgid "The diversion path is too long"
 msgstr "Der Umleitungspfad ist zu lang."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1969,30 +2410,36 @@ msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben."
 msgid "Unable to stat %s"
 msgstr "%s mit »stat« abfragen nicht möglich"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Datei %s konnte nicht geschlossen werden."
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Hash-Element konnte nicht gefunden werden!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Umleitung konnte nicht reserviert werden."
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Interner Fehler in »AddDiversion«"
+
+#: apt-inst/filelist.cc:477
 #, 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."
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden"
+msgid "Double add of diversion %s -> %s"
+msgstr "Doppelte Hinzufügung der Umleitung %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Auswerten der »control«-Datei nicht möglich"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Doppelte Konfigurationsdatei %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -2040,204 +2487,52 @@ msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Ausführen von dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Paketierungssystem »%s« wird nicht unterstützt."
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Es wurden %i Datensätze geschrieben.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, 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 "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-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Auswerten der »control«-Datei nicht möglich"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash-Summe stimmt nicht überein für: %s"
-
-#: apt-pkg/cachefile.cc:94
-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: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."
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Leerer Paketzwischenspeicher"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Die Paketzwischenspeicher-Datei ist beschädigt."
-
-#: 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:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Die Paketzwischenspeicher-Datei ist beschädigt, sie ist zu klein."
+msgid "List directory %spartial is missing."
+msgstr "Listenverzeichnis %spartial fehlt."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Hängt ab von"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Hängt ab von (vorher)"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Schlägt vor"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Empfiehlt"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Kollidiert mit"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Ersetzt"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Löst ab"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Beschädigt"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Wertet auf"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "wichtig"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "erforderlich"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standard"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "optional"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Archives directory %spartial is missing."
+msgstr "Archivverzeichnis %spartial fehlt."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
+msgid "Unable to lock directory %s"
+msgstr "Das Verzeichnis %s kann nicht gesperrt werden."
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, 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:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s ist nicht korrekt gestartet."
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Indexdateityp »%s« wird nicht unterstützt."
 
-#: 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/depcache.cc:250
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "StateFile %s konnte nicht geöffnet werden."
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Holen der Datei %li von %li (noch %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
+msgid "Retrieving file %li of %li"
+msgstr "Holen der Datei %li von %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2253,11 +2548,10 @@ msgid "Size mismatch"
 msgstr "Größe stimmt nicht überein"
 
 #: apt-pkg/acquire-item.cc:173
-#, fuzzy
 msgid "Invalid file format"
-msgstr "Ungültige Operation %s"
+msgstr "Ungültiges Dateiformat"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2266,17 +2560,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2285,12 +2579,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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2301,12 +2595,12 @@ msgstr ""
 "GPG-Fehler: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-Fehler: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2316,192 +2610,139 @@ msgstr ""
 "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
 "Architektur)."
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, 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/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
+msgid "Is the package %s installed?"
+msgstr "Ist das Paket %s installiert?"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Methode %s ist nicht korrekt gestartet."
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese "
-"APT-Version umgehen kann."
+"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und "
+"drücken Sie die Eingabetaste (Enter)."
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: 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 ""
-"Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen "
-"diese APT-Version umgehen kann."
+"Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür "
+"gefunden werden."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
-"Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen "
-"diese APT-Version umgehen kann."
+"Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; "
+"dies könnte durch zurückgehaltene Pakete verursacht worden sein."
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
-"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden."
-
-#: 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Paketlisten werden gelesen"
+"Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte "
+"Pakete."
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
+#: apt-pkg/cachefile.cc:94
+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/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/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."
 
-#: 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/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Die Liste der Quellen konnte nicht gelesen werden."
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Herstellerblock %s enthält keinen Fingerabdruck."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden."
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listenverzeichnis %spartial fehlt."
+msgid "Version '%s' for '%s' was not found"
+msgstr "Version »%s« für »%s« konnte nicht gefunden werden."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Archivverzeichnis %spartial fehlt."
+msgid "Couldn't find task '%s'"
+msgstr "Task »%s« konnte nicht gefunden werden."
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Das Verzeichnis %s kann nicht gesperrt werden."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:615
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Holen der Datei %li von %li (noch %s)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Mittels des Musters »%s« konnte kein Paket gefunden werden."
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, c-format
-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"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei "
-"eintragen."
-
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s mit stat abfragen nicht möglich"
+"Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein "
+"virtuell ist."
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
-"Der Wert »%s« ist für APT::Default-Release ungültig, da solch eine "
-"Veröffentlichung in den Paketquellen nicht verfügbar ist."
+"Es kann weder eine installierte Version noch ein Installationskandidat von "
+"Paket »%s« ausgewählt werden, da beide nicht existieren."
 
-#: apt-pkg/policy.cc:422
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 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"
+"Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein "
+"virtuell ist."
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 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:503 apt-pkg/packagemanager.cc:533
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "»%s« konnte nicht konfiguriert werden. "
+"Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein "
+"solcher existiert."
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es "
+"nicht installiert ist."
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2585,58 +2826,89 @@ msgstr "Schreiben der neuen Quellliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Quelllisteneinträge für dieses Medium sind:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "%s mit stat abfragen nicht möglich"
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Abhängigkeitsbaum wird aufgebaut."
 
-#: 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: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/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "StateFile %s konnte nicht geöffnet werden."
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Szenario an Problemlöser senden"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Anfrage an Problemlöser senden"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Vorbereiten, eine Lösung zu erhalten"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 "Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Externen Problemlöser ausführen"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
+msgid "Wrote %i records.\n"
+msgstr "Es wurden %i Datensätze geschrieben.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash-Summe stimmt nicht überein für: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2663,10 +2935,232 @@ msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Paketierungssystem »%s« wird nicht unterstützt."
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr "Fortschritt: [%3i%%]"
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Ausführen von dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "»%s« konnte nicht konfiguriert werden. "
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Leerer Paketzwischenspeicher"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Die Paketzwischenspeicher-Datei ist beschädigt."
+
+#: 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: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: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: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:321
+msgid "Depends"
+msgstr "Hängt ab von"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Hängt ab von (vorher)"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Schlägt vor"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Empfiehlt"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Kollidiert mit"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Ersetzt"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Löst ab"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Beschädigt"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Wertet auf"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "wichtig"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "erforderlich"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standard"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "optional"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Indexdateityp »%s« wird nicht unterstützt."
+
+#: 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/sourcelist.cc:127
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
+msgstr "Missgestalteter Absatz %u in Quellliste %s (»URI parse«)"
 
 #: apt-pkg/sourcelist.cc:170
 #, c-format
@@ -2735,253 +3229,151 @@ 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/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:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version »%s« für »%s« konnte nicht gefunden werden."
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ »%s« ist in Absatz %u der Quellliste %s ist unbekannt."
 
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Task »%s« konnte nicht gefunden werden."
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
+msgid "Unable to parse package file %s (1)"
+msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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."
+msgid "Unable to parse package file %s (2)"
+msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Es kann weder eine installierte Version noch ein Installationskandidat von "
-"Paket »%s« ausgewählt werden, da beide nicht existieren."
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein "
-"virtuell ist."
+"Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden "
+"ignoriert oder alte an ihrer Stelle benutzt."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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."
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Herstellerblock %s enthält keinen Fingerabdruck."
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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."
+msgid "Unable to stat the mount point %s"
+msgstr "Einbindungspunkt %s mit »stat« abfragen nicht möglich."
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "%s wird installiert."
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "CD-ROM mit »stat« abfragen fehlgeschlagen"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "%s wird konfiguriert."
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Befehlszeilenoption »%c« [aus %s] ist nicht bekannt."
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "%s wird entfernt."
+msgid "Command line option %s is not understood"
+msgstr "Befehlszeilenoption %s konnte nicht ausgewertet werden."
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "%s wird vollständig entfernt."
+msgid "Command line option %s is not boolean"
+msgstr "Befehlszeilenoption %s ist nicht Bool'sch."
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Verschwinden von %s festgestellt"
+msgid "Option %s requires an argument."
+msgstr "Option %s erfordert ein Argument."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Aufruf des Nach-Installations-Triggers %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<Wert>«."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Verzeichnis »%s« fehlt"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«."
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Datei »%s« konnte nicht geöffnet werden."
+msgid "Option '%s' is too long"
+msgstr "Option »%s« ist zu lang."
 
-#: apt-pkg/deb/dpkgpm.cc:989
+# Check for boolean; -1 is unspecified, 0 is yes 1 is no
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "%s wird vorbereitet."
+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/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "%s wird entpackt."
+msgid "Invalid operation %s"
+msgstr "Ungültige Operation %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Konfiguration von %s wird vorbereitet."
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Nicht erkannte Typabkürzung: »%c«"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "%s installiert"
+msgid "Opening configuration file %s"
+msgstr "Konfigurationsdatei %s wird geöffnet"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Entfernen von %s wird vorbereitet."
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "%s entfernt"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaxfehler %s:%u: Missgestaltete Markierung"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Vollständiges Entfernen von %s wird vorbereitet."
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn nach Wert"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s vollständig entfernt"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
-"wegen voller Festplatte hindeutet."
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
-"wegen erschöpftem Arbeitsspeicher hindeutet."
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
-"wegen voller Festplatte hindeutet."
+"Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von "
-"einem anderen Prozess verwendet?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaxfehler %s:%u: Eingefügt von hier"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Sperren des Administrationsverzeichnisses (%s) nicht möglich, sind Sie root?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"Der dpkg-Prozess wurde unterbrochen; Sie müssen manuell »%s« ausführen, um "
-"das Problem zu beheben."
+"Syntaxfehler %s:%u: Löschdirektiven benötigen einen Optionsbaum als Argument"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Nicht gesperrt"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3105,54 +3497,11 @@ msgstr "Problem beim Entfernen (unlink) der Datei %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Auswahl %s nicht gefunden"
+msgid "No keyring installed in %s."
+msgstr "Kein Schlüsselring in %s installiert"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3210,530 +3559,238 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "No keyring installed in %s."
-msgstr "Kein Schlüsselring in %s installiert"
+msgid "%c%s... Error!"
+msgstr "%c%s... Fehler!"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Befehlszeilenoption »%c« [aus %s] ist nicht bekannt."
+msgid "%c%s... Done"
+msgstr "%c%s... Fertig"
 
-#: 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/progress.cc:181
+msgid "..."
+msgstr "..."
 
-#: apt-pkg/contrib/cmndline.cc:168
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Befehlszeilenoption %s ist nicht Bool'sch."
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Option %s erfordert ein Argument."
+msgid "%lid %lih %limin %lis"
+msgstr "%li d %li h %li min %li s"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<Wert>«."
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«."
+msgid "%limin %lis"
+msgstr "%li min %li s"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Option »%s« ist zu lang."
+msgid "%lis"
+msgstr "%li s"
 
-# Check for boolean; -1 is unspecified, 0 is yes 1 is no
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, 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«."
+msgid "Selection %s not found"
+msgstr "Auswahl %s nicht gefunden"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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?"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
-"Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Paketerweiterungsliste ist zu lang."
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Fehler beim Verarbeiten von Verzeichnis %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Quellerweiterungsliste ist zu lang."
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei"
+"Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von "
+"einem anderen Prozess verwendet?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Fehler beim Verarbeiten der Inhalte %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-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 "Unable to lock the administration directory (%s), are you root?"
 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:841
-msgid "No selections matched"
-msgstr "Keine Auswahl traf zu"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«."
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old"
+"Sperren des Administrationsverzeichnisses (%s) nicht möglich, sind Sie root?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern."
-
-#: ftparchive/cachedb.cc:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink von %s fehlgeschlagen"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Archiv hat keinen Steuerungsdatensatz."
-
-#: ftparchive/cachedb.cc:594
-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."
+"Der dpkg-Prozess wurde unterbrochen; Sie müssen manuell »%s« ausführen, um "
+"das Problem zu beheben."
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Nicht gesperrt"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "Öffnen von %s fehlgeschlagen"
+msgid "Installing %s"
+msgstr "%s wird installiert."
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Configuring %s"
+msgstr "%s wird konfiguriert."
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink von %s fehlgeschlagen"
+msgid "Removing %s"
+msgstr "%s wird entfernt."
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Entfernen (unlink) von %s fehlgeschlagen"
+msgid "Completely removing %s"
+msgstr "%s wird vollständig entfernt."
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
+msgid "Noting disappearance of %s"
+msgstr "Verschwinden von %s festgestellt"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-Limit von %sB erreicht\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archiv hatte kein Feld »package«"
+msgid "Running post-installation trigger %s"
+msgstr "Aufruf des Nach-Installations-Triggers %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
+msgid "Directory '%s' missing"
+msgstr "Verzeichnis »%s« fehlt"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s-Betreuer ist %s und nicht %s.\n"
+msgid "Could not open file '%s'"
+msgstr "Datei »%s« konnte nicht geöffnet werden."
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
+msgid "Preparing %s"
+msgstr "%s wird vorbereitet."
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Speicheranforderung fehlgeschlagen"
+msgid "Unpacking %s"
+msgstr "%s wird entpackt."
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, 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"
+msgid "Preparing to configure %s"
+msgstr "Konfiguration von %s wird vorbereitet."
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Override-Datei %s konnte nicht gelesen werden."
+msgid "Installed %s"
+msgstr "%s installiert"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Missgestaltetes Override %s Zeile %llu #1"
+msgid "Preparing for removal of %s"
+msgstr "Entfernen von %s wird vorbereitet."
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Missgestaltetes Override %s Zeile %llu #2"
+msgid "Removed %s"
+msgstr "%s entfernt"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Missgestaltetes Override %s Zeile %llu #3"
+msgid "Preparing to completely remove %s"
+msgstr "Vollständiges Entfernen von %s wird vorbereitet."
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Unbekannter Komprimierungsalgorithmus »%s«"
+msgid "Completely removed %s"
+msgstr "%s vollständig entfernt"
 
-#: ftparchive/multicompress.cc:103
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz."
+msgid "Can not write log (%s)"
+msgstr "Schreiben des Protokolls nicht möglich (%s)"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE* konnte nicht erzeugt werden."
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr "Ist /dev/pts eingebunden?"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Fork fehlgeschlagen"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr "Ist stdout ein Terminal?"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimierungs-Kindprozess"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Interner Fehler, %s konnte nicht erzeugt werden."
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
+"erreicht ist."
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "E/A zu Kindprozess/Datei fehlgeschlagen"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf "
+"hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem beim Entfernen (unlink) von %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
+"wegen voller Festplatte hindeutet."
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
+"wegen erschöpftem Arbeitsspeicher hindeutet."
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Unbekannter Paketeintrag!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
+"im lokalen System hindeutet."
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Ein-/"
+"Ausgabe-Fehler von Dpkg hindeutet."
+
+#~ msgid "ioctl(TIOCGWINSZ) failed"
+#~ msgstr "ioctl(TIOCGWINSZ) fehlgeschlagen"
+
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Interner Fehler, Upgrade hat etwas beschädigt."
 
 #~ 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 6bc554cde..3ed665f94 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -101,76 +101,76 @@ msgstr "གི་དོན་ལུ་རྩིས་�ོ་བ�ོན་ཡ
 msgid "Package file %s is out of sync."
 msgstr "�ུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་�ར་ཨིན་པས�"
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "�ྱོད་ཀྱིས་�ག་�ག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%s�ུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་�ོབ�"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "�ུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་�ར་ཨིན་པས་  �ུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པས�"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "�བ་གཟེར་བ�བ་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(མ་�ོབ�)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ�"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "མི་ངོ:"
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ཅི་མེད�)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "�ུམ་སྒྲིལ་གྱི་�བ་གཟེར:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "�ོན་རིམ་�ིག་�ྲམ�:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -334,7 +334,7 @@ msgid "Couldn't find package %s"
 msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "འདི་འབད�་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན�"
@@ -362,7 +362,7 @@ msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག
 msgid "Must specify at least one package to fetch source for"
 msgstr "གི་དོན་ལུ་འབྱུང་�ུངས་ལེན་ནི་ལུ་ཉུང་མ�འ་རང་�ུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s་གི་དོན་ལུ་འབྱུང་�ུངས་�ུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འ�ོབ"
@@ -388,7 +388,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s་ནང་བར་སྟོང་"
@@ -421,7 +421,7 @@ msgstr "%s་འབྱུང་�ུངས་ལེན�\n"
 msgid "Failed to fetch some archives."
 msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "ཕབ་ལེན་�བས་ལམ་ར�ྱངམ་གཅིག་ནང་མཇུག་བསྡུ�་སྦེ་རང་ཕབ་ལེན་འབད�"
 
@@ -430,68 +430,68 @@ msgstr "ཕབ་ལེན་�བས་ལམ་ར�ྱངམ་གཅིག
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ�\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འ�ུས་ཤོར་བྱུང་ཡོད�\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev'་�ུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་ག�ང་འབད�\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འ�ུས་ཤོར་བྱུང་ཡོད�\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འ�ུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མ�འ་རང་�ུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས�"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, 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:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་ས�ོང་ནི་འདི་འ�ུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་  གཞི་བཙུགས་འབད་ཡོད་པའི་�ུམ་"
 "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས�"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -500,37 +500,37 @@ msgstr ""
 "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་ས�ོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་�ུམ་སྒརིལ་%s་གི་འ�ོན་རིམ་"
 "ཚུ་འ�ོབ་མ་ཚུགསཔ་ལས་བརྟེན་འ�ོན་རིམ་དགོས་མ�ོ་ཚུ་གི་རེ་བ་དོ་ས�ོང་མ་ཚུགས་པས�"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, 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:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འ�ུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས�"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ་ཨིན�"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s)་ལུ་མ�ུད་དོ�"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "རྒྱབ་ས�ྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -619,16 +619,20 @@ msgstr ""
 "ཤོག་ལེབ་ཚུ་ལུ་བལྟ�\n"
 "                       འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད�\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "གི་དོན་ལུ་འབྱུང་�ུངས་ལེན་ནི་ལུ་ཉུང་མ�འ་རང་�ུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -637,6 +641,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -666,8 +671,9 @@ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འ�ོན་རི
 msgid "%s was already not hold.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འ�ོན་རིམ་གསར་ཤོས་ཅིག་ཨིན�\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབད�་ད་ཕར་མིན་འདུག"
@@ -862,7 +868,7 @@ msgstr "སོ་ཀེཊི་ཅིག་གསར་བས�ྲུན་འ
 msgid "Could not connect data socket, connection timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་མ�ུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་  མ�ུད་ལམ་ངལ་མཚམས�"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "འ�ུས་ཤོར་བྱུང་ཡོད�"
 
@@ -908,7 +914,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མà½�ུད་ནà½
 msgid "Unable to accept connection"
 msgstr "མ�ུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས�"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ�"
 
@@ -1041,93 +1047,184 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲི�་ད་འཛོལ་བ�"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ� �ག་རིང་མཇུག་གི་མ�ུད་ལམ་དེ་�་བསྡམས�"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ�"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "ཡིག་སྣོད་ལུ་འབྲི�་ད་འཛོལ་བ�"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "སེལ་འ�ུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "མ�ུད་ལམ་ངལ་མཚམས་འབད་ཡོད�"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲི�་ད་འཛོལ་བ�"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ�"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "མགོ་ཡིག་གི་གྲལ་�ིག་བྱང་ཉེས�"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བ�ང་ཡོད�"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བ�ང་ཡོད�"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-�ྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བ�ང་ཡོད�"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ �ྱབ་ཚད་ཀྱི་རྒྱབ་ས�ྱོར་དེ་ཆད་པ་བཟོ་བ�ང་ནུག"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས�"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "བ�ུད་ལམ་འ�ུས་ཤོར་བྱུང་ཡོད�"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "ནང་འ�ོད་འཛོལ་བ�"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "ཨེབ�"
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "ལེན:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "ཨེལ་ཇི་ཨེན:"
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "ཨི་ཨར་ཨར�"
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [ལཱ་འབད་དོ�]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"བརྡ་ལམ་བསྒྱུར་བཅོས:�་ཡིག་བཀོད་ཡོད་པའི་ཌིསིཀ་འདི་\n"
+" '%s'\n"
+"འདྲེན་འཕྲུལ་'%s'ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ�\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ཉེན་བརྡ:འོག་གི་�ུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བ�ུབ་པས�"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད�\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "�ུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས�"
+
+#: apt-private/private-download.cc:50
+#, fuzzy
+msgid "Install these packages without verification?"
+msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་�ུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེད�ོག་ལས་ལག་ལེན་འ�བ་སྟེ་ཡོད�"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "%s  %s་ ལེན་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "ནང་འ�ོད་ཀྱི་འཛོལ་བ་  གཞི་བཙུགས་�ུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ་དང་གཅིག་�ར་བོད་བརྡ་འབད་འདི་"
 "ཡོད!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "�ུམ་སྒྲིལ་ཚུ་རྩ་བས�ྲད་བ�ང་དགོཔ་འདུག་འདི་འབདག�་ད་རྩ་བས�ྲད་ག�ང་ནི་འདི་ལྕོགས་མིན་�ལ་�ེ་འདུག"
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "ནང་འ�ོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས�"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་  ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མ�ུན་སྒྲིག་མི་འབད་"
@@ -1135,52 +1232,48 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལ�་སྦེ་ལུས་འོང་�\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s ནང་�ྱོད་ལུ་བར་སྟོང་དལ�་ལངམ་སྦེ་མིན་འདུག"
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེད�ོག་ལས་ལག་ལེན་འ�བ་སྟེ་ཡོད�"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1191,20 +1284,20 @@ msgstr ""
 "འཕྲོ་མ�ུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་ར�ྱབས�\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "བར་བཤོལ་འབད�"
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "�ྱོན་ཀྱི་འཕྲོ་མ�ུད་ནི་འབད་ནི་ཨིན་ན་"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1212,19 +1305,19 @@ msgstr ""
 "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་  apt-get་དུས་མ�ུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
 "missing་དང་གཅིག་�ར་འབད་རྩོལ་བས�ྱེད་ནི་ཨིན་ན་?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་ས�ྱོར་མི་འབད་བས�"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས�"
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ�"
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1234,15 +1327,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1258,16 +1351,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་ས�བས་འདི་མོས་མ�ུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "ནང་འ�ོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མ�ུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་�ལ་ཡོད�"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1277,7 +1370,7 @@ msgid_plural ""
 msgstr[0] "འོག་གི་�ུམ་སྒྲིས་གསརཔ་འདི་ཚུ་�ཞི་བཙུགས་འབད་འོང་:"
 msgstr[1] "འོག་གི་�ུམ་སྒྲིས་གསརཔ་འདི་ཚུ་�ཞི་བཙུགས་འབད་འོང་:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1285,7 +1378,7 @@ msgid_plural ""
 msgstr[0] "འོག་གི་�ུམ་སྒྲིས་གསརཔ་འདི་ཚུ་�ཞི་བཙུགས་འབད་འོང་:"
 msgstr[1] "འོག་གི་�ུམ་སྒྲིས་གསརཔ་འདི་ཚུ་�ཞི་བཙུགས་འབད་འོང་:"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
@@ -1303,7 +1396,7 @@ msgstr ""
 "མ་ཚང་བའི་རྟེན་འབྲེལ་  �ུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་�ར་ 'apt-get -f install'དེ་འབ�་རྩོལ་བས�ྱེདཔ�"
 "(ཡང་ན་�བས་ཤེས་ཅིག་གསལ་བཀོད་འབད�)"
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1314,72 +1407,72 @@ msgstr ""
 "འབད་འབད�་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བས�ྲུན་མ་འབད་བར་ཡོད་པའི་�ུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
 "འབྱོར་གྱི་ཕྱི་�ར་རྩ་བས�ྲད་བ�ང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འ�བ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས�"
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "ཆད་པ་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ�"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "འོག་གི་�ུམ་སྒྲིལ་�ེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བས�ྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
 "འབད་བས�\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བས�ྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
 "འབད་བས�\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བ�ུབ་པས�\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འ�ོན་རིམ་གསར་ཤོས་ཅིག་ཨིན�\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "(%s)གི་དོན་ལུ་སེལ་འ�ུ་འབད་ཡོད་པའི་འ�ོན་རིམ་'%s'(%s)\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "(%s)གི་དོན་ལུ་སེལ་འ�ུ་འབད་ཡོད་པའི་འ�ོན་རིམ་'%s'(%s)\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "�ུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བས�ྲད་མ་ག�ང་པས�་\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "�ུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བས�ྲད་མ་ག�ང་པས�་\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1387,136 +1480,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [གཞི་བཙུགས་འབད་ཡོད�]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [གཞི་བཙུགས་འབད་ཡོད�]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [གཞི་བཙུགས་འབད་ཡོད�]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [གཞི་བཙུགས་འབད་ཡོད�]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "འོག་གི་�ུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "འདི་འབད�་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད�"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "འདི་འབད�་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན�"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "འདི་འབད�་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བ�ུབ་པས�"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "འདི་འབད�་ད་ འདི་བར་ཅུ་ཡལ་�ུམ་སྒྲིལ་ཅིག་ཨིན་པས�"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "འདི་འབད�་ད་འདི་གཞི་བཙུགས་མ་འབད་བས�"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "འདི་འབད�་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས�"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr "ཡང་ན�"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "འོག་གི་�ུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "འོག་གི་�ུམ་སྒྲིས་གསརཔ་འདི་ཚུ་�ཞི་བཙུགས་འབད་འོང་:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "འོག་གི་�ུམ་སྒྲིལ་འདི་ཚུ་རྩ བས�ྲད་ག�ང་འོང་:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "འོག་གི་�ུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "འོག་གི་�ུམ་སྒྲིལ་འདི་ཚུ་ཡར་བས�ྱེད་འབད་འོང་:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "འོག་གི་�ུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "འོག་གི་འཆང་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s( %s་གིས་སྦེ)"
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1524,27 +1597,27 @@ msgstr ""
 "ཉེན་བརྡ:འོག་གི་ཉོ་མ�ོ་བའི་�ུམ་སྒྲིལ་ཚུ་རྩ་བས�ྲད་ག�ང་འོང་�\n"
 "�ྱོད་ཀྱིས་�ྱོད་རང་ག་ཅི་འབད�་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་�!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu་ཡར་བས�ྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད�"
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད�"
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད�"
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "རྩ་བས�ྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བས�ྱེད་མ་འབད་བས�\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བས�ྲད་མ་ག�ང་པས�\n"
@@ -1553,7 +1626,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1561,36 +1634,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "�འི�"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1604,36 +1669,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ཉེན་བརྡ:འོག་གི་�ུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བ�ུབ་པས�"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད�\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "�ུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས�"
-
-#: apt-private/private-download.cc:50
-#, fuzzy
-msgid "Install these packages without verification?"
-msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་�ུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s  %s་ ལེན་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1644,74 +1679,44 @@ msgstr "%s་ལུ་%s་བསà¾�ྱར་མིང་བà½�གས་ནིà¼
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "དུས་མ�ུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད�"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "འབད་ཚར་ཡི�"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "ཨེབ�"
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "ལེན:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "ཨེལ་ཇི་ཨེན:"
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "ཨི་ཨར་ཨར�"
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [ལཱ་འབད་དོ�]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"བརྡ་ལམ་བསྒྱུར་བཅོས:�་ཡིག་བཀོད་ཡོད་པའི་ཌིསིཀ་འདི་\n"
-" '%s'\n"
-"འདྲེན་འཕྲུལ་'%s'ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ�\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས�"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1789,36 +1794,434 @@ msgstr ""
 msgid "Merging available information"
 msgstr "འ�ོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ�"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས�"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "�་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %sལུ་འབྲི་མ་ཚུགས�"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "�་ཕྱོགས་�་ས�ོང་ར�ྱབ་ནི་ནང་  ནང་འ�ོད་ཀྱི་འཛོལ་བ�"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf ་་འ�ོན་རིམ་འདི་ལེན་མ་ཚུགས� debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "�ུམ་སྒྲིལ་རྒྱ་བས�ྱེད་�ོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "%s -> %s ་དང་ %s/%s་�་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བས�ྱེད་དོ�"
+msgid "Error processing directory %s"
+msgstr "སྣོད་�ོ་%s་ལས་སྦྱོར་འབད�་ད་འཛོལ་བ་འ�ོན་ཡི�"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "འབྱུང་�ུངས་རྒྱ་བས�ྱེད་ཀྱི་�ོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས�"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "%s -> %s་�་ཕྱོགས་ཀྱི་ལོག་བལྟབ་�་ས�ོང་�"
+msgid "Error processing contents %s"
+msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན�"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "སེལ་འ�ུ་ཚུ་མ�ུན་སྒྲིག་མིན་འདུག"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ�"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་�ུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་   %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བས�ྱར་མིང་བ�གས་ཡི�"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་  %s་ཡར་བས�ྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ�"
+
+#: ftparchive/cachedb.cc:94
+#, 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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་�་ཕྱེ་མ་ཚུགས�"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ�"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ�"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་�ོ་མིན་འདུག"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "ཡིག་མཛོད་ལུ་�ུམ་སྒྲིལ་ཅི་ཡང་འ�ུས་ཤོར་མ་བྱུང་�"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %sལུ་ཟུར་བཞག་�ོ་བཀོད་མེད�\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s ་རྒྱུན་ས�ྱོང་པ་འདི་  %s ཨིན་   %s མེན�\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s ལུ་འབྱུང་�ུངས་མེདཔ་ག�ང་ནིའི་�ོ་བཀོད་འདི་མེད�\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %sལུ་ཟུང་ལྡན་མེདཔ་ག�ང་ནིའི་་�ོ་བཀོད་གང་རུང་ཡང་མིན་འདུག�\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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་འབྲེལ་འ�ུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ�"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s་ལུ་%s་བས�ྱར་མིང་བ�གས་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1844,17 +2247,6 @@ msgstr "�ུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུ
 msgid "The diversion path is too long"
 msgstr "�་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས�"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1883,30 +2275,36 @@ msgstr "à½�ུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སà
 msgid "Unable to stat %s"
 msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས�"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མ�ུད་མཚམས་གུར་བཀོག་བཞག་མ�ུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོད�"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s་ཡིག་སྣོད་འདི་�་བསྡམས་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "�་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "�་ཕྱོགས་�་ས�ོང་ར�ྱབ་ནི་ནང་  ནང་འ�ོད་ཀྱི་འཛོལ་བ�"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་  '%s'འ�ུས་མི་བརླག་སྟོར་ཞུགས་དོ�"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "%s -> %s ་དང་ %s/%s་�་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བས�ྱེད་དོ�"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "ནང་འ�ོད་འཛོལ་བ་གིས་འ�ུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འ�ོབ�"
+msgid "Double add of diversion %s -> %s"
+msgstr "%s -> %s་�་ཕྱོགས་ཀྱི་ལོག་བལྟབ་�་ས�ོང་�"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "མིང་དཔྱད་འབད་མ་བ�ུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད�"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ�"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1954,201 +2352,52 @@ msgstr "ཊར་ཅེག་སམ་དེ་འ�ུས་ཤོར་བྱ
 msgid "Unknown TAR header type %u, member %s"
 msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འ�ུས་མི་ %s�"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་ས�ྱོར་མ་འབད་བས�"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་ག�ན་འབེབས་བཟོ་མི་ཚུགས་པས�"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i་དྲན་མ�ོ་དེ་ཚུ་བྲིས་ཡོད�\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་�ར་ %i དྲན་�ོ་འདི་ཚུ་བྲིས་ཡོད�\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i་མ�ུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་�ར་ %i་དྲན་�ོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན�\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་  '%s'འ�ུས་མི་བརླག་སྟོར་ཞུགས་དོ�"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམ�ུན་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་�ར་ %i དྲན་�ོ་འདི་ཚུ་བྲིས་"
-"ཡོདཔ་ཨིན�\n"
+msgid "Internal error, could not locate member %s"
+msgstr "ནང་འ�ོད་འཛོལ་བ་གིས་འ�ུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འ�ོབ�"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "མིང་དཔྱད་འབད་མ་བ�ུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད�"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "ཨེམ་ཌི་༥་ �ྱོན་བསྡོམས་མ་མ�ུན་པ�"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "�ུམ་སྒྲིལ་གྱི་�ོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་�་ཕྱེ་མ་ཚུགས�"
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ �ྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་�"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "འབྱུང་�ུངས་ཚུ་ཀྱི་�ོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས�"
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ�"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས�"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "�ུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མ�ུན་པའི་འ�ོན་རིམ་ཅིག་ཨིན་པས�"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས�"
-
-#: apt-pkg/pkgcache.cc:174
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འ�ོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་ས�ྱོར་མི་འབད་བས�"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབད�་ཨིནཔས�"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "རྟེནམ་ཨིན�"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན�"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "བསམ་འཆར་བཀོདཔ་ཨིན�"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "འོས་སྦྱོར་འབད�་ཨིན�"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "མི་མ�ུནམ་ཨིན�"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "ཚབ་བཙུགསཔ་ཨིན�"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "ཕན་མེདཔ་བཟོ�་ཨིན�"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "གལ་ཅན�"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "དགོས་མ�ོ་ཡོདཔ�"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "ཚད་ལྡན�"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "གདམ་�་ཅན�"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "�ེབས�"
+msgid "List directory %spartial is missing."
+msgstr "�ོ་བཀོད་འབད་མི་སྣོད་�ོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་�ེ་འདུག"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "�བས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འ�ོབ�"
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "ཡིག་མཛོད་སྣོད་�ོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་�ེ་འདུག"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:99
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev'་�ུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་ག�ང་འབད�\n"
+msgid "Unable to lock directory %s"
+msgstr "�ོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་ར�ྱབ་མ་ཚུགས�"
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "�བས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད�"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "ཟུར་�ོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་ས�ྱོར་མ་འབད་བས�"
 
-#: apt-pkg/acquire-worker.cc:455
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "�་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་� '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ�་"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ�)"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ཟུར་�ོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་ས�ྱོར་མ་འབད་བས�"
-
-#: 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
-#, fuzzy
-msgid "Reading state information"
-msgstr "འ�ོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ�"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-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་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
+msgid "Retrieving file %li of %li"
+msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2169,35 +2418,35 @@ msgstr "ཚད་མ་མ�ུན�"
 msgid "Invalid file format"
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "%s (༡་)་�ུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས�"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འ�ོབ་མི་ཚུགས་པས:\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2205,12 +2454,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2219,177 +2468,121 @@ msgstr ""
 " %s་�ུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འ�ོབ་པས� འདི་འབད�་ལས་�ྱོད་ཀྱི་ལག་�ོག་ལས་ "
 "འ་ནི་�ུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན�)"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "�ུམ་སྒྲིལ་ ཟུར་�ོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་�ུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ�"
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "འདྲ་མཛོད་ལུ་མ�ུན་འགྱུར་མེན་པའི་འ�ོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "�བས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འ�ོབ�"
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev'་�ུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་ག�ང་འབད�\n"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "པའོ་་་�ྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་�ུབ་པའི་�ུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "�བས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད�"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "པའོ་་་�ྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་�ུབ་པའི་�ོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "�་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་� '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ�་"
 
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "པའོ་་་�ྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་�ུབ་པའི་�ོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+#: 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 ""
+"�ུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབད�་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་"
+"མ་�ོབ�"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "པའོ་་་�ྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་�ུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བ�ོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མ�ུན་བཟོ�་ཨིན འ་ནི་�ུམ་"
+"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་ར�ྱེན་ལས་བརྟེན་ཨིན་པས�"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་�ུམ་སྒྲིལ་ %s %s ་འདི་མ་�ོབ་པས�"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ �ྱོད་ཀྱི་�ུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "འབྱུང་�ུངས་�ུམ་སྒྲིལ་གྱི་�ོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས�"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+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 "�ུམ་སྒྲིལ་�ོ་ཡིག་ཚུ་ལྷག་དོ�"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ �ྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་�"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ�"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "འབྱུང་�ུངས་ཚུ་ཀྱི་�ོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས�"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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 འཛོལ་བ་འབྱུང་�ུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ�"
+msgid "Release '%s' for '%s' was not found"
+msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འ�ོབ་པས�"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག"
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%s'་གི་དོན་ལུ་འ�ོན་རིམ་'%s'་དེ་མ་འ�ོབ་པས�"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "�ོ་བཀོད་འབད་མི་སྣོད་�ོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་�ེ་འདུག"
+msgid "Couldn't find task '%s'"
+msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "ཡིག་མཛོད་སྣོད་�ོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་�ེ་འདུག"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ�)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, 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"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"�ྱོད་རའི་sources.listགི་�ོ་ཡིག་ནང་ལུ་�ྱོད་ཀྱི་ 'འབྱུང་�ུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས�"
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་�ོ་  �ུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག"
-
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, 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 "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས�"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "%s་ཡིག་སྣོད་འདི་�་ཕྱེ་མ་ཚུགས�"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"མི་མ�ུན་/སྔོན་རྟེན་འཕྲལ་བཀོལ་ལས་བརྟེན་ འ་ནི་གཞི་བཙུགས་གཡོག་བཀོལ་འདི་ལུ་ མེད་དུ་མི་རུང་བའི་%s�ུམ་"
-"སྒྲིལ་  གནས་ས�བས་ཀྱི་རྩ་བས�ྲད་ག�ང་ནི་འདི་དགོས་མ�ོ་ཡོདཔ་ཨིན� འདི་འཕྲལ་འཕྲལ་རང་བྱང་ཉེས་ཅིག་ཨིན་པས་ "
-"འདི་འབད�་ད་�ྱོད་ཀྱི་�ད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་�་འདི་ཤུགས་"
-"ལྡན་བཟོ�"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2470,55 +2663,89 @@ msgstr "འབྱུང་�ུངས་ཀྱི་�ོ་ཡིག་གས
 msgid "Source list entries for this disc are:\n"
 msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་�ུངས་ཧྲིལ་བུ་ཚུ་:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"�ུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབད�་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་"
-"མ་�ོབ�"
+msgid "Unable to stat %s."
+msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས�"
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བ�ོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མ�ུན་བཟོ�་ཨིན འ་ནི་�ུམ་"
-"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་ར�ྱེན་ལས་བརྟེན་ཨིན་པས�"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ�"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-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
+#, fuzzy
+msgid "Reading state information"
+msgstr "འ�ོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ�"
+
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ�"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "%s (༡་)་�ུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས�"
+msgid "Wrote %i records.\n"
+msgstr "%i་དྲན་མ�ོ་དེ་ཚུ་བྲིས་ཡོད�\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "%s (༢་)་�ུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས�"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་�ར་ %i དྲན་�ོ་འདི་ཚུ་བྲིས་ཡོད�\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i་མ�ུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་�ར་ %i་དྲན་�ོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན�\n"
+
+#: 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 ""
+"%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམ�ུན་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་�ར་ %i དྲན་�ོ་འདི་ཚུ་བྲིས་"
+"ཡོདཔ་ཨིན�\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "ཨེམ་ཌི་༥་ �ྱོན་བསྡོམས་མ་མ�ུན་པ�"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2545,6 +2772,215 @@ msgstr "%s་à½�་ཕྱོགས་ཡིག་སྣོད་ནང་ནུà
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "%s (༡་)་�ུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས�"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་ས�ྱོར་མ་འབད་བས�"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་ག�ན་འབེབས་བཟོ་མི་ཚུགས་པས�"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "%s་ཡིག་སྣོད་འདི་�་ཕྱེ་མ་ཚུགས�"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ�"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས�"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "�ུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མ�ུན་པའི་འ�ོན་རིམ་ཅིག་ཨིན་པས�"
+
+#: apt-pkg/pkgcache.cc:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས�"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འ�ོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་ས�ྱོར་མི་འབད་བས�"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབད�་ཨིནཔས�"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "རྟེནམ་ཨིན�"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན�"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "བསམ་འཆར་བཀོདཔ་ཨིན�"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "འོས་སྦྱོར་འབད�་ཨིན�"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "མི་མ�ུནམ་ཨིན�"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "ཚབ་བཙུགསཔ་ཨིན�"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "ཕན་མེདཔ་བཟོ�་ཨིན�"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "གལ་ཅན�"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "དགོས་མ�ོ་ཡོདཔ�"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "ཚད་ལྡན�"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "གདམ་�་ཅན�"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "�ེབས�"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "པའོ་་་�ྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་�ུབ་པའི་�ུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "པའོ་་་�ྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་�ུབ་པའི་�ོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "པའོ་་་�ྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་�ུབ་པའི་�ོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "པའོ་་་�ྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་�ུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "འབྱུང་�ུངས་�ུམ་སྒྲིལ་གྱི་�ོ་ཡིག་%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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO འཛོལ་བ་འབྱུང་�ུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ�"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "ཟུར་�ོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་ས�ྱོར་མ་འབད་བས�"
+
+#: 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 record in the preferences file %s, no Package header"
+msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་�ོ་  �ུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2620,221 +3056,144 @@ msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་�ིག་%u་ག
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་�ིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་�ུངས་�ོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས�"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འ�ོབ་པས�"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"�ྱོད་རའི་sources.listགི་�ོ་ཡིག་ནང་ལུ་�ྱོད་ཀྱི་ 'འབྱུང་�ུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%s'་གི་དོན་ལུ་འ�ོན་རིམ་'%s'་དེ་མ་འ�ོབ་པས�"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
+msgid "Unable to parse package file %s (1)"
+msgstr "%s (༡་)་�ུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས�"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "%s (༢་)་�ུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས�"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 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"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
+"ཟུར་�ོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ནུག་  འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
+"རྙིངམ་འདི་ཚུ་ལག་ལེན་འ�བ་ནུག"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགས�"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s�"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "%s་རིམ་སྒྲིག་འབད་དོ�"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "བརྡ་བཀོད་གྲལ་�ིག་གྱི་གདམ་�་'%c'[%s་ནང་ལས་]འདི་མ་ཤེས་པས�"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "%s་རྩ་བས�ྲད་ག�ང་དོ�"
-
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s མཇུག་བསྡུ�་སྦེ་རང་རྩ་བས�ྲད་བ�ང་ཡོད�"
+msgid "Command line option %s is not understood"
+msgstr "བ་རྡ་བཀོད་གྲལ་�ིག་གི་གདམ་�་%s་འདི་ཧ་མ་གོ་བས�"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Command line option %s is not boolean"
+msgstr "བརྡ་བཀོད་གྲལ་�ིག་གི་གདམ་�་%s་འདི་བུ་ལིན་མེན་པས�"
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "�ོ་བཀོད་འབད་མི་སྣོད་�ོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་�ེ་འདུག"
-
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "%s་ཡིག་སྣོད་འདི་�་ཕྱེ་མ་ཚུགས�"
+msgid "Option %s requires an argument."
+msgstr "གདམ་�་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས�"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Preparing %s"
-msgstr "%s་ གྲ་སྒྲིག་འབད་དོ�"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "གདམ་�་%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ =<val> ་ཅིག་དགོཔ་ཨིན�"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Unpacking %s"
-msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ�"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "གདམ་�་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མ�ོ་ཡོདཔ་ཨིན"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ�"
+msgid "Option '%s' is too long"
+msgstr "གདམ་�་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Installed %s"
-msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s�"
+msgid "Sense %s is not understood, try true or false."
+msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་  བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བས�ྱེདཔ�"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s་ རྩ་བས�ྲད་ག�ང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ�"
+msgid "Invalid operation %s"
+msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Removed %s"
-msgstr "རྩ་བས�ྲད་བ�ང་ཡོད་པའི་%s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s མཇུག་བསྡུ�་སྦེ་རང་རྩ་བས�ྲད་ག�ང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ�"
+msgid "Opening configuration file %s"
+msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་�་ཕྱེ་དོ�"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s མཇུག་བསྡུ�་སྦེ་རང་རྩ་བས�ྲད་བ�ང་ཡོད�"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:  སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་�ར་འགོ་བཙུགསཔ་ཨིན"
 
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས�"
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མ�ོ་མེད་�ེབས�"
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབད�་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན�"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་ས�ྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ�"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "�ོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་ར�ྱབ་མ་ཚུགས�"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་ར�ྱངམ་ཅིག་བྱིན་ཚུགས�"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མ�ོ་མེད་�ེབས�"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2950,54 +3309,11 @@ msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེད
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... འབད་ཚར་ཡོད�"
-
-#. 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 ་མ་འ�ོབ�"
+msgid "No keyring installed in %s."
+msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ�"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3052,524 +3368,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་�ེ་ཡོད�"
+msgid "%c%s... Error!"
+msgstr "%c%s... འཛོལ་བ་!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, 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:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་ར�ྱངམ་ཅིག་བྱིན་ཚུགས�"
+msgid "%c%s... Done"
+msgstr "%c%s... འབད་ཚར་ཡོད�"
 
-#: apt-pkg/contrib/configuration.cc:950
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མ�ོ་མེད་�ེབས�"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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་འདི་བུ་ལིན་མེན་པས�"
+msgid "%c%s... %u%%"
+msgstr "%c%s... འབད་ཚར་ཡོད�"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "གདམ་�་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས�"
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "གདམ་�་%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ =<val> ་ཅིག་དགོཔ་ཨིན�"
+msgid "%lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "གདམ་�་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མ�ོ་ཡོདཔ་ཨིན"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "གདམ་�་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་  བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བས�ྱེདཔ�"
+msgid "Selection %s not found"
+msgstr "སེལ་འ�ུ་%s ་མ་འ�ོབ�"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "�ུམ་སྒྲིལ་རྒྱ་བས�ྱེད་�ོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "སྣོད་�ོ་%s་ལས་སྦྱོར་འབད�་ད་འཛོལ་བ་འ�ོན་ཡི�"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "འབྱུང་�ུངས་རྒྱ་བས�ྱེད་ཀྱི་�ོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས�"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "�ོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་ར�ྱབ་མ་ཚུགས�"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན�"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "སེལ་འ�ུ་ཚུ་མ�ུན་སྒྲིག་མིན་འདུག"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་�ུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག"
 
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་   %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བས�ྱར་མིང་བ�གས་ཡི�"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་  %s་ཡར་བས�ྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ�"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
-"ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས�  �ྱོད་ཀྱི་ apt་ གྱི་འ�ོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་  ཡར་བས�ྱེད་འབད་ཡོད་"
-"པ་ཅིན་  རྩ་བས�ྲད་ག�ང་ཞིནམ་ལས་  གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བས�ྲུན་འབད� "
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་�་ཕྱེ་མ་ཚུགས�"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ�"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་�ོ་མིན་འདུག"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "འོད་རྟགས་ལེན་མ་ཚུགས�"
 
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "ཌབ་ལུ:%sསྣོད་�ོ་འདི་ལྷག་མ་ཚུགས�\n"
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s�"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, 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 "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད�"
+msgid "Configuring %s"
+msgstr "%s་རིམ་སྒྲིག་འབད་དོ�"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "%s་མོས་མ�ུན་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ�"
+msgid "Removing %s"
+msgstr "%s་རྩ་བས�ྲད་ག�ང་དོ�"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འ�ུ་ཤོར་བྱུང་ཡོདཔ�"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s མཇུག་བསྡུ�་སྦེ་རང་རྩ་བས�ྲད་བ�ང་ཡོད�"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s་ག་ཕྱེ་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ�"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr ""
 
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ�"
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "�ོ་བཀོད་འབད་མི་སྣོད་�ོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་�ེ་འདུག"
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ�"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "%s་ཡིག་སྣོད་འདི་�་ཕྱེ་མ་ཚུགས�"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s་ལས་%sལུ་འབྲེལ་འ�ུད་འབད་ནི་འ�ུས་ཤོར་བྱུང་ཡོདཔ�"
+msgid "Preparing %s"
+msgstr "%s་ གྲ་སྒྲིག་འབད་དོ�"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས�\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "ཡིག་མཛོད་ལུ་�ུམ་སྒྲིལ་ཅི་ཡང་འ�ུས་ཤོར་མ་བྱུང་�"
+msgid "Unpacking %s"
+msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ�"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %sལུ་ཟུར་བཞག་�ོ་བཀོད་མེད�\n"
+msgid "Preparing to configure %s"
+msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ�"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s ་རྒྱུན་ས�ྱོང་པ་འདི་  %s ཨིན་   %s མེན�\n"
+msgid "Installed %s"
+msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s�"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ལུ་འབྱུང་�ུངས་མེདཔ་ག�ང་ནིའི་�ོ་བཀོད་འདི་མེད�\n"
+msgid "Preparing for removal of %s"
+msgstr "%s་ རྩ་བས�ྲད་ག�ང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ�"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %sལུ་ཟུང་ལྡན་མེདཔ་ག�ང་ནིའི་་�ོ་བཀོད་གང་རུང་ཡང་མིན་འདུག�\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འ�ུས་ཤོར་བྱུང་ཡོད�"
+msgid "Removed %s"
+msgstr "རྩ་བས�ྲད་བ�ང་ཡོད་པའི་%s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "%s མཇུག་བསྡུ�་སྦེ་རང་རྩ་བས�ྲད་ག�ང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ�"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "%s མཇུག་བསྡུ�་སྦེ་རང་རྩ་བས�ྲད་བ�ང་ཡོད�"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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ལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག"
+msgid "Can not write log (%s)"
+msgstr " %sལུ་འབྲི་མ་ཚུགས�"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "ཡིག་སྣོད་*་ གསར་བས�ྲུན་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "�་སྤེལ་འབད་ནི་ལུ་འ�ུ་ཤོར་བྱུང་ཡོད�"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད�"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "ནང་འ�ོད་འཛོལ་བ་ %s་གསར་བས�ྲུན་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འ�ུས་ཤོར་བྱུང་ཡོད�"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "ཨེམ་ཌི་༥་གློག་རིག་ར�ྱབ་པའི་ས�བས་ལྷག་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s་འབྲེལ་འ�ུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ�"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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 "མ་ཤེས་པའི་�ུམ་སྒྲིལ་གི་དྲན་�ོ�"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བས�ྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་�ལ་ཡོད�"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s འདི་ནུས་ཅན་གྱི་ ཌི་ཨི་བི་ཅིག་མེན་པས�"
diff --git a/po/el.po b/po/el.po
index c012379f2..92f178b0d 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -24,7 +24,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"org>\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
@@ -107,75 +106,75 @@ msgstr "Συνολικός Καταμετ�ημένος Χώ�ος: "
 msgid "Package file %s is out of sync."
 msgstr "Το α�χείο πακέτου %s δεν είναι ενημε�ωμένο."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Π�έπει να δώσετε τουλάχιστον ένα μοτίβο αναζήτησης"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Αδυναμία εντοπισμο� του πακέτου %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Α�χεία Πακέτου:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Καθηλωμένα Πακέτα:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(δε β�έθηκαν)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Εγκατεστημένα: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Υποψήφιο: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr " Καθήλωση Πακέτου: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Πίνακας Έκδοσης:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -340,7 +339,7 @@ msgid "Couldn't find package %s"
 msgstr "Αδ�νατη η ε��εση του πακέτου %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέ�ι\n"
@@ -372,7 +371,7 @@ msgstr ""
 "Θα π�έπει να καθο�ίσετε τουλάχιστον ένα πακέτο για να μεταφο�τώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Αδυναμία εντοπισμο� του κώδικά του πακέτου %s"
@@ -398,7 +397,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Πα�άκαμψη του ήδη μεταφο�τωμένου α�χείου `%s`\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Δεν μπό�εσα να π�οσδιο�ίσω τον ελε�θε�ο χώ�ο στο %s"
@@ -431,7 +430,7 @@ msgstr "Μεταφό�τωση Κωδικα %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Αποτυχία μεταφό�τωσης με�ικών α�χειοθηκών."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Ολοκλη�ώθηκε η μεταφό�τωση μόνο"
 
@@ -440,48 +439,48 @@ msgstr "Ολοκλη�ώθηκε η μεταφό�τωση μόνο"
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Πα�άκαμψη της αποσυμπίεσης ήδη μεταφο�τωμένου κώδικα στο %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Η απογονική διε�γασία απέτυχε"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Θα π�έπει να καθο�ίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξα�τήσεων του"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Αδ�νατη η ε��εση πλη�οφο�ιών χτισίματος για το %s"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "το %s δεν έχει εξα�τήσεις χτισίματος.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -490,7 +489,7 @@ msgstr ""
 "%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή το %s δεν επιτ�έπεται στο "
 "πακέτο %s"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -498,14 +497,14 @@ msgid ""
 msgstr ""
 "%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή το πακέτο %s δεν β�έθηκε"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Αποτυχία ικανοποίησης %s εξα�τήσεων για το %s: Το εγκατεστημένο πακέτο %s "
 "είναι νεώτε�ο"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -514,7 +513,7 @@ msgstr ""
 "%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή δεν υπά�χουν διαθέσιμες "
 "εκδόσεις του πακέτου %s που να ικανοποιο�ν τις απαιτήσεις της έκδοσης"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -523,30 +522,30 @@ msgstr ""
 "%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή το πακέτο %s δεν έχει "
 "υποψήφιαέκδοση"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Αποτυχία ικανοποίησης %s εξά�τησης για το %s: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Οι εξα�τήσεις χτισίματος για το %s δεν ικανοποιο�νται."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Αποτυχία επεξε�γασίας εξα�τήσεων χτισίματος"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog για %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Υποστη�ιζόμενοι Οδηγοί:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -631,18 +630,22 @@ msgstr ""
 "για πε�ισσότε�ες πλη�οφο�ίες και επιλογές.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 "Θα π�έπει να καθο�ίσετε τουλάχιστον ένα πακέτο για να μεταφο�τώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -651,6 +654,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -680,8 +684,9 @@ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 msgid "%s was already not hold.\n"
 msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Αναμονή του %s, αλλά δε β�ισκόταν εκεί"
@@ -875,7 +880,7 @@ msgstr "Αδ�νατη η δημιου�γία μιας υποδοχής (socket
 msgid "Could not connect data socket, connection timed out"
 msgstr "Αδ�νατη η σ�νδεση υποδοχής δεδομένων, λήξη χ�όνου σ�νδεσης"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Απέτυχε"
 
@@ -921,7 +926,7 @@ msgstr "Λήξη χÏ�όνου σÏ�νδεσης στην υποδοχή δεδοÎ
 msgid "Unable to accept connection"
 msgstr "Αδ�νατη η αποδοχή συνδέσεων"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Π�όβλημα κατά το hashing του α�χείου"
 
@@ -1056,93 +1061,185 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγ�αφή στο α�χείο"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκ�ο έκλεισε τη σ�νδεση"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγ�αφή στο α�χείο"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Η επιλογή απέτυχε"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Λήξη χ�όνου σ�νδεσης"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγ�αφή στο α�χείο εξόδου"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Αναμονή επικεφαλίδων"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Ελαττωματική γ�αμμή επικεφαλίδας"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Ο διακομιστής http έστειλε μια άκυ�η επικεφαλίδα απάντησης"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Ο διακομιστής http έστειλε μια άκυ�η επικεφαλίδα Content-Length"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Ο διακομιστής http έστειλε μια άκυ�η επικεφαλίδα Content-Range"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Ο διακομιστής http δεν υποστη�ίζει πλή�ως το range"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Άγνωστη μο�φή ημε�ομηνίας"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Η σ�νδεση απέτυχε"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Εσωτε�ικό Σφάλμα"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Hit "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Φέ�ε:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Αγνόησε "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Σφάλμα "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Επεξε�γασία]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Αλλαγή Μέσου: Πα�ακαλώ εισάγετε το δίσκο με ετικέτα\n"
+" '%s'\n"
+"στη συσκευή '%s' και πιέστε  enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακ�ιβώθηκαν!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Πα�άκαμψη π�οειδοποίησης ταυτοποίησης.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Με�ικά πακέτα δεν εξαακ�ιβώθηκαν"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Εγκατάσταση των πακέτων χω�ίς επαλήθευση;"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Υπά�χουν π�οβλήματα και δώσατε -y  χω�ίς το --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Αποτυχία ανάκτησης του %s   %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Εσωτε�ικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Με�ικά πακέτα π�έπει να αφαι�εθο�ν αλλά η Αφαί�εση είναι απενε�γοποιημένη."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Εσωτε�ικό Σφάλμα, η Ταξινόμηση δεν ολοκλη�ώθηκε"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Πολ� πε�ίε�γο! Τα μεγέθη δεν ται�ιάζουν, στείλτε μήνυμα στο apt@packages."
@@ -1150,21 +1247,21 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1172,31 +1269,27 @@ 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
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Μετά από αυτή τη λειτου�γία, θα ελευθε�ωθο�ν %sB χώ�ου από το δίσκο.\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Δεν διαθέτετε α�κετό ελε�θε�ο χώ�ο στο  %s."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Υπά�χουν π�οβλήματα και δώσατε -y  χω�ίς το --force-yes"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "�αι, κανε ότι λέω!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1207,19 +1300,19 @@ msgstr ""
 "Για να συνεχίσετε πληκτ�ολογήστε τη φ�άση '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Εγκατάλειψη."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Θέλετε να συνεχίσετε;"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Για με�ικά α�χεία απέτυχε η μεταφό�τωση"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1227,20 +1320,20 @@ msgstr ""
 "Αδ�νατη η μεταφό�τωση με�ικών α�χείων, ίσως αν δοκιμάζατε με apt-get update "
 "ή το --fix-missing;"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστη�ίζεται για την ώ�α"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Αδ�νατη η επίλυση των χαμένων πακέτων."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Εγκατάλειψη της εγκατάστασης."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1250,16 +1343,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Δεν επιτ�έπεται οποιαδήποτε διαγ�αφή· αδυναμία εκκίνησης του AutoRemover"
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1277,15 +1370,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "Οι ακόλουθες πλη�οφο�ίες ίσως βοηθήσουν στην επίλυση του π�οβλήματος:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Εσωτε�ικό Σφάλμα, το AutoRemover δημιο��γησε κάποιο π�όβλημα"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1295,7 +1388,7 @@ msgstr[0] "Το ακόλουθο πακέτο εγκαταστάθηκε αυτÏ
 msgstr[1] ""
 "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χ�ειάζονται πλέον:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1305,7 +1398,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χ�ειάζονται πλέον:"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Χ�ησιμοποιήστε 'apt-get autoremove' για να το διαγ�άψετε."
@@ -1323,7 +1416,7 @@ msgstr ""
 "Ανεπίλυτες εξα�τήσεις. Δοκιμάστε 'apt-get -f install' χω�ίς να ο�ίσετε "
 "πακέτο (ή καθο�ίστε μια λ�ση)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1335,73 +1428,73 @@ msgstr ""
 "διανομή, ότι με�ικά από τα πακέτα δεν έχουν ακόμα δημιου�γηθεί ή έχουν\n"
 "μετακινηθεί από τα εισε�χόμενα."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Χαλασμένα πακέτα"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθο�ν:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Π�οτεινόμενα πακέτα:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Συνιστώμενα πακέτα:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Πα�άκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει ο�ιστεί.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Πα�άκαμψη του %s, είναι εγκατεστημένο και μόνο αναβαθμίσεις έχουν ο�ιστεί.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφό�τωσή "
 "του\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s λόγω του %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαι�εθεί. Εννοείτε '%s'?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαι�εθεί\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1409,138 +1502,116 @@ msgid_plural ""
 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."
+#: 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-get -f install για να διο�θώσετε αυτά τα "
-"π�οβλήματα."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Ανεπίλυτες εξα�τήσεις. Δοκιμάστε με το -f."
 
 #: apt-private/private-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Εγκατεστημένα]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Εγκατεστημένα]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Εγκατεστημένα]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Εγκατεστημένα]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξα�τήσεις:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "αλλά το %s είναι εγκατεστημένο"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "αλλά το %s π�όκειται να εγκατασταθεί"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "αλλά δεν είναι εγκαταστάσημο"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "αλλά είναι ένα εικονικό πακέτο"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "αλλά δεν είναι εγκατεστημένο"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "αλλά δεν π�όκειται να εγκατασταθεί"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " η"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξα�τήσεις:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Τα ακόλουθα �ΕΑ πακέτα θα εγκατασταθο�ν:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥ�:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστο�ν:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥ�:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Τα ακόλουθα κ�ατημένα πακέτα θα αλλαχθο�ν:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (λόγω του %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1548,27 +1619,27 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απα�αίτητα πακέτα θα αφαι�εθο�ν\n"
 "Αυτό ΔΕ� θα έπ�επε να συμβεί, εκτός αν ξέ�ετε τι ακ�ιβώς κάνετε!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu επανεγκατεστημένα,"
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu υποβαθμισμένα, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu θα αφαι�εθο�ν και %lu δεν αναβαθμίζονται.\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu μη πλή�ως εγκατεστημένα ή αφαι�έθηκαν.\n"
@@ -1577,7 +1648,7 @@ msgstr "%lu μη πλή�ως εγκατεστημένα ή αφαι�έθηκα
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[�/ο]"
 
@@ -1585,36 +1656,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr "[ν/Ο]"
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1628,35 +1691,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακ�ιβώθηκαν!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Πα�άκαμψη π�οειδοποίησης ταυτοποίησης.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Με�ικά πακέτα δεν εξαακ�ιβώθηκαν"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Εγκατάσταση των πακέτων χω�ίς επαλήθευση;"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Αποτυχία ανάκτησης του %s   %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1667,74 +1701,44 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Η εντολή update δεν παί�νει ο�ίσματα"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Ετοιμο"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Hit "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Φέ�ε:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Αγνόησε "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Σφάλμα "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Επεξε�γασία]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Αλλαγή Μέσου: Πα�ακαλώ εισάγετε το δίσκο με ετικέτα\n"
-" '%s'\n"
-"στη συσκευή '%s' και πιέστε  enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Αδ�νατη η ανάγνωση του %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1812,36 +1816,433 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Σ�μπτυξη Διαθέσιμων Πλη�οφο�ιών"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Αποτυχία εντοπισμο� του στοιχείου hash!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Αδ�νατη η ε��εση της κατάστασης του %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Αδυναμία εντοπισμο� εκτ�οπής"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Αδ�νατη η εγγ�αφή στο %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Εσωτε�ικό Σφάλμα στο AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Δεν β�έθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπε�βολικά μακ��ς"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Π�οσπάθεια για αντικατάσταση εκτ�οπής, %s -> %s και %s/%s"
+msgid "Error processing directory %s"
+msgstr "Σφάλμα επεξε�γασίας του καταλόγου %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπε�βολικά μακ��ς"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Σφάλμα εγγ�αφής κεφαλίδων στο α�χείο πε�ιεχομένων"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Διπλή π�οσθήκη εκτ�οπής %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Σφάλμα επεξε�γασίας πε�ιεχομένων του %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Δεν ται�ιαξε καμία επιλογή"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Διπλό α�χείο �υθμίσεων %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Λείπουν με�ικά α�χεία από την ομάδα πακέτων '%s'"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Η βάση είναι κατεστ�αμμένη, το α�χείο μετονομάστηκε σε %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Η βάση δεν είναι ενημε�ωμένη, γίνεται π�οσπάθεια να αναβαθμιστεί το %s"
+
+#: ftparchive/cachedb.cc:94
+#, 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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Το άνοιγμά του α�χείου της βάσης %s: %s απέτυχε"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Αποτυχία ε��εσης της κατάστασης του %s."
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Αποτυχία ανάγνωσης του %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Η α�χειοθήκη δεν πε�ιέχει πεδίο ελέγχου"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Η α�χειοθήκη δεν πε�ιέχει πεδίο πακέτων"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s δεν πε�ιέχει εγγ�αφή πα�άκαμψης\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s συντη�ητής είναι ο %s όχι ο %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s δεν έχει εγγ�αφή πηγαίας πα�άκαμψης\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s δεν έχει ο�τε εγγ�αφή δυαδικής πα�άκαμψης\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Αποτυχία μετονομασίας του %s σε %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1867,17 +2268,6 @@ msgstr "Το πακέτο π�οσπαθεί να γ�άψει στον π�οο
 msgid "The diversion path is too long"
 msgstr "Η διαδ�ομή εκτ�οπής έχει υπε�βολικό μήκος"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1906,30 +2296,36 @@ msgstr "Το αÏ�χείο %s/%s αντικαθιστά αυτό στο πακέÏ
 msgid "Unable to stat %s"
 msgstr "Αδ�νατη η ε��εση της κατάστασης του %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Αποτυχία στο κλείσιμο του α�χείου %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Αποτυχία εντοπισμο� του στοιχείου hash!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Αδυναμία εντοπισμο� εκτ�οπής"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Εσωτε�ικό Σφάλμα στο AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Αυτό δεν είναι ένα έγκυ�ο α�χείο DEB, αγνοείται το μέλος '%s'"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Π�οσπάθεια για αντικατάσταση εκτ�οπής, %s -> %s και %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Εσωτε�ικό Σφάλμα, αδυναμία εντοπισμο� του μέλους %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Διπλή π�οσθήκη εκτ�οπής %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Μη αναλ�σιμο α�χείο control"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Διπλό α�χείο �υθμίσεων %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1977,202 +2373,52 @@ msgstr "Το Checksum του tar απέτυχε, η αÏ�χείοθήκη είνÎ
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Άγνωστη επικεφαλίδα TAR τ�πος %u, μέλος %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Το σ�στημα συσκευασίας '%s' δεν υποστη�ίζεται"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Αδ�νατος ο καθο�ισμός ενός κατάλληλου τ�που συστήματος πακέτων"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Εγιναν %i εγγ�αφές.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Εγιναν %i εγγ�αφές με %i απώντα α�χεία.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Εγιναν %i εγγ�αφές με %i ασ�μβατα α�χεία.\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Αυτό δεν είναι ένα έγκυ�ο α�χείο DEB, αγνοείται το μέλος '%s'"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Εγιναν %i εγγ�αφές με %i απώντα α�χεία και %i ασ�μβατα α�χεία\n"
+msgid "Internal error, could not locate member %s"
+msgstr "Εσωτε�ικό Σφάλμα, αδυναμία εντοπισμο� του μέλους %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Μη αναλ�σιμο α�χείο control"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Ανόμοιο MD5Sum"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Αδ�νατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του α�χείου κατάστασης."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Ίσως να π�έπει να τ�έξετε apt-get update για να διο�θώσετε αυτά τα π�οβλήματα"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Αδ�νατη η ανάγνωση της λίστας πηγών."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Άδειο cache πακέτων"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Το α�χείο cache των πακέτων είναι κατεστ�αμμένο"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "Το α�χείο cache των πακέτων είναι ασ�μβατης έκδοσης"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Το α�χείο cache των πακέτων είναι κατεστ�αμμένο"
-
-#: apt-pkg/pkgcache.cc:174
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Αυτό το APT δεν υποστη�ίζει το Σ�στημα Απόδοσης Έκδοσης '%s'"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφο�ετική α�χιτεκτονική"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Εξα�τάται από"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Π�οΕξα�τάται από"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Π�οτείνει"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Συστήνει"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Ασ�μβατο με"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Αντικαθιστά"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Απα�χαιώνει"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Χαλάει"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "σημαντικό"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "απαιτο�μενο"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "καθιε�ωμένο"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "π�οαι�ετικό"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "επιπλέον"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ο οδηγός μεθόδου %s δεν μπο�εί να εντοπιστεί."
+msgid "List directory %spartial is missing."
+msgstr "Ο φάκελος λιστών %spartial αγνοείται."
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
+msgid "Archives directory %spartial is missing."
+msgstr "Ο φάκελος α�χειοθηκών %spartial αγνοείται."
 
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Πα�ακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
-"enter."
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Αδ�νατο το κλείδωμα του καταλόγου"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "Ο τ�πος α�χείου ευ�ετη�ίου '%s' δεν υποστη�ίζεται"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Αποτυχία ανοίγματος του α�χείου κατάστασης %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Κατέβασμα του α�χείου %li του %li (απομένουν %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Αποτυχία εγγ�αφής του α�χείου κατάστασης %s"
+msgid "Retrieving file %li of %li"
+msgstr "Λήψη α�χείου %li του %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2192,35 +2438,35 @@ msgstr "Ανόμοιο μέγεθος"
 msgid "Invalid file format"
 msgstr "Μη έγκυ�η λειτου�γία %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Αδ�νατη η ανάλυση του α�χείου πακέτου %s (1)"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Δεν υπά�χει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2228,12 +2474,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2242,12 +2488,12 @@ msgstr ""
 "Αδ�νατος ο εντοπισμός ενός α�χείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χ�ειάζεται να διο�θώσετε χει�οκίνητα το πακέτο. (λόγω χαμένου α�χείου)"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2255,168 +2501,113 @@ msgstr ""
 "Κατεστ�αμμένα α�χεία ευ�ετη�ίου πακέτων. Δεν υπά�χει πεδίο Filename: στο "
 "πακέτο %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Η cache έχει ασ�μβατο σ�στημα απόδοσης έκδοσης"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Ο οδηγός μεθόδου %s δεν μπο�εί να εντοπιστεί."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Π�οέκυψε σφάλμα κατά την επεξε�γασία του %s (FindPkg)"
+msgid "Is the package %s installed?"
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπε�βήκατε τον α�ιθμό των ονομάτων πακέτων που υποστη�ίζει το "
-"APT."
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Εκπληκτικό, υπε�βήκατε τον α�ιθμό των εκδόσεων που υποστη�ίζει το APT."
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Πα�ακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
+"enter."
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: 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."
+"Το πακέτο '%s' χ�ειάζεται να επανεγκατασταθεί, αλλά είναι αδ�νατη η ε��εση "
+"κάποιας κατάλληλης α�χείοθήκης."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
-"Εκπληκτικό, υπε�βήκατε τον α�ιθμό των εξα�τήσεων που υποστη�ίζει το APT."
+"Σφάλμα, το pkgProblemResolver::Resolve πα�ήγαγε διακοπές, αυτό ίσως "
+"π�οκλήθηκε από κ�ατο�μενα πακέτα."
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Το πακέτο %s %s δε β�έθηκε κατά την επεξε�γασία εξα�τήσεων του α�χείου"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Αδ�νατη η διό�θωση π�οβλημάτων, έχετε κ�ατο�μενα ελαττωματικά πακέτα."
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Αδ�νατη η ε��εση της κατάστασης της λίστας πηγαίων πακέτων %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+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 "Ανάγνωση Λιστών Πακέτων"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Ίσως να π�έπει να τ�έξετε apt-get update για να διο�θώσετε αυτά τα π�οβλήματα"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Συλλογή Πα�οχών Α�χείου"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Αδ�νατη η ανάγνωση της λίστας πηγών."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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 πηγών"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Η έκδοση %s για το %s δεν β�έθηκε"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Η εγγ�αφή κατασκευαστή %s δεν πε�ιέχει ταυτότητα"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Η έκδοση %s για το %s δεν β�έθηκε"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Ο φάκελος λιστών %spartial αγνοείται."
+msgid "Couldn't find task '%s'"
+msgstr "Αδ�νατη η ε��εση του συνόλου πακέτων %s"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Ο φάκελος α�χειοθηκών %spartial αγνοείται."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Αδ�νατη η ε��εση του πακέτου %s"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr "Κατέβασμα του α�χείου %li του %li (απομένουν %s)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Αδ�νατη η ε��εση του πακέτου %s"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, 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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"Με�ικά α�χεία δεν μεταφο�τώθηκαν, αγνοήθηκαν ή χ�ησιμοποιήθηκαν παλαιότε�α "
-"στη θέση τους."
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Π�έπει να τοποθετήσετε με�ικά URI 'πηγών' στο sources.list"
-
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Αδ�νατη η ε��εση της κατάστασης του %s."
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Μη έγκυ�η εγγ�αφή στο α�χείο π�οτιμήσεων, καμία επικεφαλίδα Package"
-
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Did not understand pin type %s"
-msgstr "Αδ�νατη η κατανόηση του τ�που καθήλωσης %s"
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"Δεν έχει ο�ιστεί π�οτε�αιότητα (ή έχει ο�ιστεί μηδενική) για την καθήλωση"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Αδ�νατο το άνοιγμα του α�χείου %s"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"Αυτή η π�οσπάθεια εγκατάστασης απαιτεί π�οσω�ινή αφαί�εση του σημαντικο� "
-"πακέτου %s λόγω ενός β�όγχου Ασυμβατότητας/Π�οΕξά�τησης. Αυτό συνήθως δεν "
-"είναι καλό, αλλά εάν π�αγματικά θέλετε να συνεχίσετε ενε�γοποιήστε την "
-"επιλογή APT::Force-LoopBreak option."
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2498,55 +2689,86 @@ msgstr "Eγγ�αφή νέας λίστας πηγών\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Οι κατάλογοι με τις πηγές αυτο� του δίσκου είναι: \n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Το πακέτο '%s' χ�ειάζεται να επανεγκατασταθεί, αλλά είναι αδ�νατη η ε��εση "
-"κάποιας κατάλληλης α�χείοθήκης."
+msgid "Unable to stat %s."
+msgstr "Αδ�νατη η ε��εση της κατάστασης του %s."
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Σφάλμα, το pkgProblemResolver::Resolve πα�ήγαγε διακοπές, αυτό ίσως "
-"π�οκλήθηκε από κ�ατο�μενα πακέτα."
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Κατασκευή Δένδ�ου Εξα�τήσεων"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-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 "Failed to open StateFile %s"
+msgstr "Αποτυχία ανοίγματος του α�χείου κατάστασης %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Αποτυχία εγγ�αφής του α�χείου κατάστασης %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Αδ�νατη η ανάλυση του α�χείου πακέτου %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Εγιναν %i εγγ�αφές.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Αδ�νατη η ανάλυση του α�χείου πακέτου %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Εγιναν %i εγγ�αφές με %i απώντα α�χεία.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Εγιναν %i εγγ�αφές με %i ασ�μβατα α�χεία.\n"
+
+#: 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 "Εγιναν %i εγγ�αφές με %i απώντα α�χεία και %i ασ�μβατα α�χεία\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Ανόμοιο MD5Sum"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2573,6 +2795,219 @@ msgstr "Μη έγκυÏ�η γÏ�αμμή στο αÏ�χείο παÏ�ακάμψεωÎ
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Αδ�νατη η ανάλυση του α�χείου πακέτου %s (1)"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Το σ�στημα συσκευασίας '%s' δεν υποστη�ίζεται"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Αδ�νατος ο καθο�ισμός ενός κατάλληλου τ�που συστήματος πακέτων"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Αδ�νατο το άνοιγμα του α�χείου %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Άδειο cache πακέτων"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Το α�χείο cache των πακέτων είναι κατεστ�αμμένο"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "Το α�χείο cache των πακέτων είναι ασ�μβατης έκδοσης"
+
+#: apt-pkg/pkgcache.cc:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Το α�χείο cache των πακέτων είναι κατεστ�αμμένο"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Αυτό το APT δεν υποστη�ίζει το Σ�στημα Απόδοσης Έκδοσης '%s'"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφο�ετική α�χιτεκτονική"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Εξα�τάται από"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Π�οΕξα�τάται από"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Π�οτείνει"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Συστήνει"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Ασ�μβατο με"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Αντικαθιστά"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Απα�χαιώνει"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Χαλάει"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "σημαντικό"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "απαιτο�μενο"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "καθιε�ωμένο"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "π�οαι�ετικό"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "επιπλέον"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπε�βήκατε τον α�ιθμό των ονομάτων πακέτων που υποστη�ίζει το "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Εκπληκτικό, υπε�βήκατε τον α�ιθμό των εκδόσεων που υποστη�ίζει το APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπε�βήκατε τον α�ιθμό των πε�ιγ�αφών που υποστη�ίζει το APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπε�βήκατε τον α�ιθμό των εξα�τήσεων που υποστη�ίζει το APT."
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Αδ�νατη η ε��εση της κατάστασης της λίστας πηγαίων πακέτων %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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Ο τ�πος α�χείου ευ�ετη�ίου '%s' δεν υποστη�ίζεται"
+
+#: 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 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2648,221 +3083,146 @@ msgstr "Ο τ�πος '%s' στη γ�αμμή %u στη λίστα πηγών %
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Ο τ�πος '%s' στη γ�αμμή %u στη λίστα πηγών %s είναι άγνωστος "
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Η έκδοση %s για το %s δεν β�έθηκε"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Π�έπει να τοποθετήσετε με�ικά URI 'πηγών' στο sources.list"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Η έκδοση %s για το %s δεν β�έθηκε"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Αδ�νατη η ε��εση του συνόλου πακέτων %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Αδ�νατη η ε��εση του πακέτου %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Αδ�νατη η ε��εση του πακέτου %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Αδ�νατη η ανάλυση του α�χείου πακέτου %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "Αδ�νατη η ανάλυση του α�χείου πακέτου %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
+"Με�ικά α�χεία δεν μεταφο�τώθηκαν, αγνοήθηκαν ή χ�ησιμοποιήθηκαν παλαιότε�α "
+"στη θέση τους."
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Η εγγ�αφή κατασκευαστή %s δεν πε�ιέχει ταυτότητα"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "Αδ�νατη η ε��εση της κατάστασης του σημείου επαφής %s"
 
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Αδ�νατη η ε��εση της κατάστασης του cdrom"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "Εγκατάσταση του %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Η επιλογή γ�αμμής εντολών '%c' [από %s] δεν είναι γνωστή."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "Ρ�θμιση του %s"
+msgid "Command line option %s is not understood"
+msgstr "Η επιλογή γ�αμμής εντολών %s δεν είναι κατανοητή"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "Αφαι�ώ το %s"
+msgid "Command line option %s is not boolean"
+msgstr "Η επιλογή γ�αμμής εντολών %s δεν είναι boolean"
 
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-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/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
+"Επιλογή %s: Οι π�οδιαγ�αφές του αντικειμένου �υθμίσεων απαιτο�ν =<val>."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Εκτέλεση του post-installation trigger %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Επιλογή %s: απαιτείται ένας ακέ�αιος α�ιθμός ως ό�ισμα, όχι '%s'"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Ο φάκελος %s αγνοείται."
-
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Αδ�νατο το άνοιγμα του α�χείου %s"
+msgid "Option '%s' is too long"
+msgstr "Η επιλογή '%s' έχει υπε�βολικό μήκος"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Π�οετοιμασία του %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Ξεπακετά�ισμα του %s"
+msgid "Invalid operation %s"
+msgstr "Μη έγκυ�η λειτου�γία %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Π�οετοιμασία ��θμισης του %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Μη αναγνω�ισμένος τ�πος σ�ντμησης: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "Έγινε εγκατάσταση του %s"
+msgid "Opening configuration file %s"
+msgstr "Άνοιγμα του α�χείου �υθμίσεων %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Π�οετοιμασία για την αφαί�εση του %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Συντακτικό σφάλμα %s:%u: Το block α�χίζει χω�ίς όνομα."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "Αφαί�εσα το %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μο�φή Ετικέτας (Tag)"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Π�οετοιμασία πλή�ης αφαί�εσης του %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Συντακτικό σφάλμα %s:%u: Άχ�ηστοι χα�ακτή�ες μετά την τιμή"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Το %s διαγ�άφηκε πλή�ως"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
+"Συντακτικό σφάλμα %s:%u: Οι οδηγίες β�ίσκονται μόνο στο ανώτατο επίπεδο"
 
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Συντακτικό σφάλμα %s:%u: Υπε�βολικός α�ιθμός συνδυασμένων includes"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστη�ιζόμενη εντολή '%s'"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, 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:110
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
+"Συντακτικό σφάλμα %s:%u: Οι οδηγίες β�ίσκονται μόνο στο ανώτατο επίπεδο"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Συντακτικό σφάλμα %s:%u: Άχ�ηστοι χα�ακτή�ες στο τέλος του α�χείου"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2980,54 +3340,11 @@ msgstr "Π�όβλημα κατά την διαγ�αφή του α�χείου"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Ολοκλη�ώθηκε"
-
-#. 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 δε β�έθηκε"
+msgid "No keyring installed in %s."
+msgstr "Εγκατάλειψη της εγκατάστασης."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3082,526 +3399,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Συντακτικό σφάλμα %s:%u: Συμπε�ιλαμβάνεται από εδώ"
+msgid "%c%s... Error!"
+msgstr "%c%s... Σφάλμα!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστη�ιζόμενη εντολή '%s'"
+msgid "%c%s... Done"
+msgstr "%c%s... Ολοκλη�ώθηκε"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Ολοκλη�ώθηκε"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Η επιλογή %s απαιτεί ένα ό�ισμα."
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "%lih %limin %lis"
 msgstr ""
-"Επιλογή %s: Οι π�οδιαγ�αφές του αντικειμένου �υθμίσεων απαιτο�ν =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Επιλογή %s: απαιτείται ένας ακέ�αιος α�ιθμός ως ό�ισμα, όχι '%s'"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Η επιλογή '%s' έχει υπε�βολικό μήκος"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)."
+msgid "Selection %s not found"
+msgstr "Η επιλογή %s δε β�έθηκε"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπε�βολικά μακ��ς"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Σφάλμα επεξε�γασίας του καταλόγου %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπε�βολικά μακ��ς"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Σφάλμα εγγ�αφής κεφαλίδων στο α�χείο πε�ιεχομένων"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Αδ�νατο το κλείδωμα του καταλόγου"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Σφάλμα επεξε�γασίας πε�ιεχομένων του %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Δεν ται�ιαξε καμία επιλογή"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Λείπουν με�ικά α�χεία από την ομάδα πακέτων '%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Η βάση είναι κατεστ�αμμένη, το α�χείο μετονομάστηκε σε %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Η βάση δεν είναι ενημε�ωμένη, γίνεται π�οσπάθεια να αναβαθμιστεί το %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
-"Το φο�μά της βάσης δεν είναι έγκυ�ο. Εάν αναβαθμίσατε το apt σε νεότε�η "
-"έκδοση, πα�ακαλώ αφαι�έστε και δημιου�γήστε τη βάση εκ νέου."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Το άνοιγμά του α�χείου της βάσης %s: %s απέτυχε"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Αποτυχία ανάγνωσης του %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Η α�χειοθήκη δεν πε�ιέχει πεδίο ελέγχου"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Αδ�νατη η π�όσβαση σε δείκτη"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Αδ�νατη η ανάγνωση του καταλόγου  %s\n"
+msgid "Installing %s"
+msgstr "Εγκατάσταση του %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, 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: Σφάλματα στο α�χείο"
+msgid "Configuring %s"
+msgstr "Ρ�θμιση του %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Αδ�νατη η ε��εση του %s"
+msgid "Removing %s"
+msgstr "Αφαι�ώ το %s"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Αποτυχία ανε��εσης"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Το %s διαγ�άφηκε πλή�ως"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "Αποτυχία ανοίγματος του %s"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "Αποσ�νδεση %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "Εκτέλεση του post-installation trigger %s"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Αποτυχία ανάγνωσης του %s"
+msgid "Directory '%s' missing"
+msgstr "Ο φάκελος %s αγνοείται."
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Αποτυχία αποσ�νδεσης του %s"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Αδ�νατο το άνοιγμα του α�χείου %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "    Αποτυχία σ�νδεσης του %s με το %s"
+msgid "Preparing %s"
+msgstr "Π�οετοιμασία του %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Αποσ�νδεση ο�ίου του %sB hit.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Η α�χειοθήκη δεν πε�ιέχει πεδίο πακέτων"
+msgid "Unpacking %s"
+msgstr "Ξεπακετά�ισμα του %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s δεν πε�ιέχει εγγ�αφή πα�άκαμψης\n"
+msgid "Preparing to configure %s"
+msgstr "Π�οετοιμασία ��θμισης του %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s συντη�ητής είναι ο %s όχι ο %s\n"
+msgid "Installed %s"
+msgstr "Έγινε εγκατάσταση του %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s δεν έχει εγγ�αφή πηγαίας πα�άκαμψης\n"
+msgid "Preparing for removal of %s"
+msgstr "Π�οετοιμασία για την αφαί�εση του %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s δεν έχει ο�τε εγγ�αφή δυαδικής πα�άκαμψης\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realoc - Αδυναμία εκχώ�ησης μνήμης"
+msgid "Removed %s"
+msgstr "Αφαί�εσα το %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "Π�οετοιμασία πλή�ης αφαί�εσης του %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "Το %s διαγ�άφηκε πλή�ως"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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 χ�ειάζεται καθο�ισμό συμπίεσης"
+msgid "Can not write log (%s)"
+msgstr "Αδ�νατη η εγγ�αφή στο %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Αποτυχία δημιου�γίας του ΑΡΧΕΙΟΥ"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Αποτυχία αγκίστ�ωσης"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Συμπίεση απογόνου"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Εσωτε�ικό Σφάλμα, Αποτυχία δημιου�γίας του %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "απέτυχε η Ε/Ε στην υποδιε�γασία/α�χείο"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Π�όβλημα κατά την αποσ�νδεση του %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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 "Άγνωστη εγγ�αφή πακέτου!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Εσωτε�ικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "Το %s δεν είναι έγκυ�ο πακέτο DEB."
diff --git a/po/es.po b/po/es.po
index 9cf4f2e3d..471774590 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -152,75 +152,75 @@ msgstr "Espacio registrado total: "
 msgid "Package file %s is out of sync."
 msgstr "El archivo de paquetes %s está desincronizado."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Debe proporcionar al menos un patrón de búsqueda"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 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:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Archivos de paquetes:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Paquetes con pin:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(no encontrado)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Instalados: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Pin del paquete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Tabla de versión:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -388,7 +388,7 @@ msgid "Couldn't find package %s"
 msgstr "No se pudo encontrar el paquete %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "fijado %s como instalado manualmente.\n"
@@ -417,7 +417,7 @@ msgstr "No se puede bloquear el directorio de descarga"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No se pudo encontrar un paquete de fuentes para %s"
@@ -450,7 +450,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omitiendo el fichero ya descargado «%s»\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No pude determinar el espacio libre en %s"
@@ -483,7 +483,7 @@ msgstr "Fuente obtenida %s\n"
 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en modo de sólo descarga"
 
@@ -492,49 +492,49 @@ msgstr "Descarga completa y en modo de sólo descarga"
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orden de desempaquetamiento «%s».\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orden de construcción «%s».\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Falló el proceso hijo"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcción.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -543,7 +543,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -552,14 +552,14 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -568,7 +568,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:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -577,30 +577,30 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcción"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectando a %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -691,16 +691,20 @@ msgstr ""
 "para más información y opciones.\n"
 "                       Este APT tiene poderes de Super Vaca.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -709,6 +713,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -738,8 +743,9 @@ msgstr "%s ya está en su versión más reciente.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s ya está en su versión más reciente.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero no estaba allí"
@@ -933,7 +939,7 @@ msgstr "No pude crear un socket"
 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Falló"
 
@@ -979,7 +985,7 @@ msgstr "Expiró conexión a socket de datos"
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexión"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Se produjo un problema al hacer un hash del archivo"
 
@@ -1112,93 +1118,183 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Falló la selección"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Expiró la conexión"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Esperando las cabeceras"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Mala línea de cabecera"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor de http envió una cabecera de respuesta inválida"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Éste servidor de http tiene el soporte de alcance roto"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Fallo la conexión"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Error interno"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Obj "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Des:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Trabajando]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Cambio de medio: Por favor, inserte el disco etiquetado como\n"
+" «%s»\n"
+"en la unidad «%s» y pulse Intro\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Aviso de autenticación ignorado.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Algunos paquetes no se pueden autenticar"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "¿Instalar estos paquetes sin verificación?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Hay problemas y se utilizó -y sin --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Imposible obtener %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error interno, no terminó la ordenación"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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."
@@ -1206,21 +1302,21 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1228,31 +1324,27 @@ 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
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Sí, ¡haga lo que le digo!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1263,19 +1355,19 @@ msgstr ""
 "Para continuar escriba la frase «%s»\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Abortado."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "¿Desea continuar?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "No se pudieron descargar algunos archivos"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1283,19 +1375,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:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "No se pudieron corregir los paquetes que faltan."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Abortando la instalación."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1309,16 +1401,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1336,15 +1428,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error interno, «AutoRemover» rompió cosas"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1357,7 +1449,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:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1366,7 +1458,7 @@ 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:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1385,7 +1477,7 @@ msgstr ""
 "Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o "
 "especifique una solución)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1397,70 +1489,70 @@ msgstr ""
 "inestable, que algunos paquetes necesarios no han sido creados o han\n"
 "sido movidos fuera de Incoming."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes extras:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Paquetes sugeridos:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Ignorando %s, ya está instalado y no está activada la actualización.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Ignorando %s, no está instalado y sólo se están solicitando "
 "actualizaciones.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ya está en su versión más reciente.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "El paquete %s no está instalado, no se eliminará\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "El paquete %s no está instalado, no se eliminará\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1468,136 +1560,120 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "pero %s está instalado"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "pero %s va a ser instalado"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "pero no es instalable"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "pero es un paquete virtual"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "pero no está instalado"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "pero no va a instalarse"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " o"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes NUEVOS:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Los siguientes paquetes se ELIMINAR�N:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Los siguientes paquetes se han retenido:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Se actualizarán los siguientes paquetes:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Se DESACTUALIZAR�N los siguientes paquetes:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Se cambiarán los siguientes paquetes retenidos:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1605,27 +1681,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualizados, %lu se instalarán, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizados, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu no instalados del todo o eliminados.\n"
@@ -1634,7 +1710,7 @@ msgstr "%lu no instalados del todo o eliminados.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[S/n]"
 
@@ -1642,36 +1718,28 @@ msgstr "[S/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1685,39 +1753,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Aviso de autenticación ignorado.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Algunos paquetes no se pueden autenticar"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "¿Instalar estos paquetes sin verificación?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Imposible obtener %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1728,74 +1763,44 @@ msgstr "No pude abrir %s.new"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: 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-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Listo"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Obj "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Des:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Trabajando]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Cambio de medio: Por favor, inserte el disco etiquetado como\n"
-" «%s»\n"
-"en la unidad «%s» y pulse Intro\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "No pude leer %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1873,36 +1878,435 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusionando información disponible"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode llamado en un nodo todavía ligado"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "¡No pude localizar el elemento enlazado!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "No pude leer %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "No pude asignar una desviación"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "No se puede escribir en %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Error interno en AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "La lista de extensión de paquetes es demasiado larga"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Error procesando el directorio %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "La lista de extensión de fuentes es demasiado larga"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Error escribiendo cabeceras de archivos de contenido"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Doble suma de desviación %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Error procesando contenidos %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Ninguna selección coincide"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Archivo de configuración duplicado %s/%s"
+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:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB anticuada, intentando actualizar %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "No se pudo abrir el archivo DB %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "No pude leer %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "No se pudo leer el enlace %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "No hay registro de control del archivo"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Archivo no tiene campo de paquetes"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr " %s no tiene entrada de predominio\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr " el encargado de %s es %s y no %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr " %s no tiene una entrada fuente predominante\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr " %s tampoco tiene una entrada binaria predominante\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Falló el renombre de %s a %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1928,17 +2332,6 @@ msgstr "El paquete está tratando de escribir al blanco desviado %s/%s"
 msgid "The diversion path is too long"
 msgstr "La trayectoria de desviación es demasiado larga"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1967,30 +2360,36 @@ msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s"
 msgid "Unable to stat %s"
 msgstr "No pude leer %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode llamado en un nodo todavía ligado"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "No pude cerrar el archivo %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "¡No pude localizar el elemento enlazado!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "No pude asignar una desviación"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Error interno en AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, 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»"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Error interno, no pude localizar el miembro %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Doble suma de desviación %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Archivo de control inanalizable"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Archivo de configuración duplicado %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -2039,201 +2438,52 @@ msgstr ""
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Ejecutando dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "No está soportado el sistema de paquetes «%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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i registros escritos.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i registros escritos con %i fichero de menos.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i registros escritos con %i fichero mal emparejado\n"
+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-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Error interno, no pude localizar el miembro %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "No se pudo encontrar un registro de autenticación para: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Archivo de control inanalizable"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "La suma hash difiere para: %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/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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Caché de paquetes vacía."
-
-#: 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: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:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "El archivo de caché de paquetes está dañado"
+msgid "List directory %spartial is missing."
+msgstr "Falta el directorio de listas %spartial."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Depende"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "PreDepende"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Sugiere"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Recomienda"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Entra en conflicto"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Reemplaza"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Hace obsoleto"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Rompe"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Mejora"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "importante"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "requiere"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "estándar"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opcional"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Archives directory %spartial is missing."
+msgstr "Falta el directorio de archivos %spartial."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "No se pudo encontrar el método %s."
+msgid "Unable to lock directory %s"
+msgstr "No se pudo bloquear el directorio %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El método %s no se inició correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "No se da soporte para el tipo de archivo de índice «%s»"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No se pudo abrir el fichero de estado %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Descargando fichero %li de %li (falta %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del fichero de estado temporal %s"
+msgid "Retrieving file %li of %li"
+msgstr "Descargando fichero %li de %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2253,37 +2503,37 @@ msgstr "El tamaño difiere"
 msgid "Invalid file format"
 msgstr "Operación inválida: %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2294,12 +2544,12 @@ msgstr ""
 "GPG es: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Error de GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2309,12 +2559,12 @@ msgstr ""
 "que necesita arreglar manualmente este paquete (debido a que falta una "
 "arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2322,172 +2572,122 @@ msgstr ""
 "Los archivos de índice de paquetes están dañados. No existe un campo "
 "«Filename:» para el paquete %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "La caché tiene una versión incompatible de sistema de versiones"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "No se pudo encontrar el método %s."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
+msgid "Is the package %s installed?"
+msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El método %s no se inició correctamente"
 
-#: 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/acquire-worker.cc:455
+#, 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/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: 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 ""
-"Vaya, excedió el número de descripciones que este APT es capaz de manejar."
+"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
+"éste."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
-"Vaya, excedió el número de dependencias que este APT es capaz de manejar."
+"Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido "
+"causado por paquetes retenidos."
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
-"Al procesar las dependencias de archivos no se encontró el paquete %s %s"
-
-#: 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: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"
+"No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recogiendo archivos que proveen"
+#: 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/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/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"
 
-#: 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/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "No se pudieron leer las listas de fuentes."
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Bloque de fabricante %s sin huella digital"
+msgid "Release '%s' for '%s' was not found"
+msgstr "No se encontró la Distribución «%s» para «%s»"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "Falta el directorio de listas %spartial."
+msgid "Version '%s' for '%s' was not found"
+msgstr "No se encontró la versión «%s» para «%s»"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Falta el directorio de archivos %spartial."
+msgid "Couldn't find task '%s'"
+msgstr "No se pudo encontrar la tarea «%s»"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "No se pudo bloquear el directorio %s"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "No se pudo encontrar ningún paquete con la expresión regular «%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 "Descargando fichero %li de %li (falta %s)"
+#: 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/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, c-format
-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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 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/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No se pudo leer %s."
+"No se pueden seleccionar distintas versiones del paquete «%s» porque es "
+"puramente virtual"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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/policy.cc:422
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 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/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr "No hay prioridad especificada para pin (o es cero)"
+"No se puede seleccionar la última versión del paquete «%s» dado que es "
+"puramente virtual"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 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:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "No pude abrir el fichero «%s»"
+"No se puede seleccionar una versión candidata del paquete %s dado que no "
+"tiene candidatos"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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»."
+"No se puede seleccionar una versión instalada del paquete «%s» puesto que no "
+"está instalado"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2571,56 +2771,87 @@ msgstr "Escribiendo nueva lista de fuente\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Las entradas de la lista de fuentes para este disco son:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "No se pudo leer %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencias"
 
-#: 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/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 "Failed to open StateFile %s"
+msgstr "No se pudo abrir el fichero de estado %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del fichero de estado temporal %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "No se pudo tratar el archivo de paquetes %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "%i registros escritos.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "No se pudo tratar el archivo de paquetes %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i registros escritos con %i fichero de menos.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i registros escritos con %i fichero mal emparejado\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "No se pudo encontrar un registro de autenticación para: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "La suma hash difiere para: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2647,6 +2878,223 @@ msgstr "Entrada «Valid-Until» inválida en el archivo «Release» %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrada «Date» inválida en el archivo «Release» %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "No está soportado el sistema de paquetes «%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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Ejecutando dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "No pude abrir el fichero «%s»"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Caché de paquetes vacía."
+
+#: 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: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: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: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: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:321
+msgid "Depends"
+msgstr "Depende"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "PreDepende"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Sugiere"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Recomienda"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Entra en conflicto"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Reemplaza"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Hace obsoleto"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Rompe"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Mejora"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "importante"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "requiere"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "estándar"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcional"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Recogiendo archivos que proveen"
+
+#: 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/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/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/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "No hay prioridad especificada para pin (o es cero)"
+
 #: apt-pkg/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2728,248 +3176,149 @@ msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
 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/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: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:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "No se pudo encontrar la tarea «%s»"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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: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»"
+msgid "Unable to parse package file %s (1)"
+msgstr "No se pudo tratar el archivo de paquetes %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "No se pudo tratar el archivo de paquetes %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-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:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"No se puede seleccionar la última versión del paquete «%s» dado que es "
-"puramente virtual"
+"No se han podido descargar algunos archivos de índice, se han ignorado, o se "
+"ha utilizado unos antiguos en su lugar."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Bloque de fabricante %s sin huella digital"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "No se puede obtener información del punto de montaje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "Instalando %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "No pude montar el cdrom"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "Configurando %s"
+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/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Eliminando %s"
+msgid "Command line option %s is not understood"
+msgstr "No se entiende la opción de línea de órdenes %s"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "Borrando completamente %s"
+msgid "Command line option %s is not boolean"
+msgstr "La opción de línea de órdenes %s no es un booleano"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Se detectó la desaparición de %s"
+msgid "Option %s requires an argument."
+msgstr "La opción %s necesita un argumento."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Ejecutando disparador post-instalación %s"
+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>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Falta el directorio «%s»."
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "La opción %s exige un argumento entero, no «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "No pude abrir el fichero «%s»"
+msgid "Option '%s' is too long"
+msgstr "Opción «%s» demasiado larga"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Preparando %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "El sentido %s no se entiende, pruebe verdadero o falso."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Desempaquetando %s"
+msgid "Invalid operation %s"
+msgstr "Operación inválida: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Preparándose para configurar %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Tipo de abreviación no reconocida: «%c»"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "%s instalado"
+msgid "Opening configuration file %s"
+msgstr "Abriendo fichero de configuración %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Preparándose para eliminar %s"
+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/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "%s eliminado"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Error de sintaxis %s:%u: Marca mal formada"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Preparándose para eliminar completamente %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Error de sintaxis %s:%u: Basura extra después del valor"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Se borró completamente %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemas de dependencias - dejando sin instalar"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-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:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"No se escribió un informe «apport» porque el mensaje de error indica un "
-"error de memoria excedida"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"No se escribió un informe «apport» porque el mensaje de error indica que el "
-"error es de disco lleno"
+"Error de sintaxis %s:%u: Las directivas sólo se pueden poner en el primer "
+"nivel"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"No se pudo bloquear el directorio de administración (%s), ¿quizás haya algún "
-"otro proceso utilizándolo?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Error de sintaxis %s:%u: Incluido desde aquí"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "No se encontró un archivo de réplica «%s»"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Error de sintaxis %s:%u: Directiva «%s» no soportada"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"se interrumpió la ejecución de dpkg, debe ejecutar manualmente «%s» para "
-"corregir el problema"
+"Error de sintaxis %s:%u: la directiva «clear» tiene que incluir un árbol de "
+"opciones como argumento"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "No bloqueado"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3084,54 +3433,11 @@ msgstr "Se produjo un problema al desligar el fichero %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Selección %s no encontrada"
+msgid "No keyring installed in %s."
+msgstr "No se instaló ningún anillo de claves %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3189,531 +3495,236 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Error de sintaxis %s:%u: Incluido desde aquí"
+msgid "%c%s... Error!"
+msgstr "%c%s... ¡Error!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Error de sintaxis %s:%u: Directiva «%s» no soportada"
+msgid "%c%s... Done"
+msgstr "%c%s... Hecho"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Hecho"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "La opción %s necesita un argumento."
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin. %liseg."
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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>."
+msgid "%lih %limin %lis"
+msgstr "%lih %limin. %liseg."
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "La opción %s exige un argumento entero, no «%s»"
+msgid "%limin %lis"
+msgstr "%limin. %liseg."
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opción «%s» demasiado larga"
+msgid "%lis"
+msgstr "%liseg."
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "El sentido %s no se entiende, pruebe verdadero o falso."
+msgid "Selection %s not found"
+msgstr "Selección %s no encontrada"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "La lista de extensión de paquetes es demasiado larga"
+"No se pudo bloquear el directorio de administración (%s), ¿quizás haya algún "
+"otro proceso utilizándolo?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Error procesando el directorio %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "La lista de extensión de fuentes es demasiado larga"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Error escribiendo cabeceras de archivos de contenido"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "No se encontró un archivo de réplica «%s»"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Error procesando contenidos %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Ninguna selección coincide"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, 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:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB anticuada, intentando actualizar %s"
+"se interrumpió la ejecución de dpkg, debe ejecutar manualmente «%s» para "
+"corregir el problema"
 
-#: ftparchive/cachedb.cc:94
-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."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "No bloqueado"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "No se pudo abrir el archivo DB %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "No se pudo leer el enlace %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "No hay registro de control del archivo"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "No se pudo obtener un cursor"
+msgid "Installing %s"
+msgstr "Instalando %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: No se pudo leer directorio %s\n"
+msgid "Configuring %s"
+msgstr "Configurando %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, 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 "
+msgid "Removing %s"
+msgstr "Eliminando %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:98
 #, 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."
+msgid "Completely removing %s"
+msgstr "Borrando completamente %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "No se pudo abrir %s"
+msgid "Noting disappearance of %s"
+msgstr "Se detectó la desaparición de %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "Ejecutando disparador post-instalación %s"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "No se pudo leer el enlace %s"
+msgid "Directory '%s' missing"
+msgstr "Falta el directorio «%s»."
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "No se pudo desligar %s"
+msgid "Could not open file '%s'"
+msgstr "No pude abrir el fichero «%s»"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** No pude enlazar %s con %s"
+msgid "Preparing %s"
+msgstr "Preparando %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink se ha llegado al límite de %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archivo no tiene campo de paquetes"
+msgid "Unpacking %s"
+msgstr "Desempaquetando %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s no tiene entrada de predominio\n"
+msgid "Preparing to configure %s"
+msgstr "Preparándose para configurar %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " el encargado de %s es %s y no %s\n"
+msgid "Installed %s"
+msgstr "%s instalado"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s no tiene una entrada fuente predominante\n"
+msgid "Preparing for removal of %s"
+msgstr "Preparándose para eliminar %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s tampoco tiene una entrada binaria predominante\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - No pudo reservar memoria"
+msgid "Removed %s"
+msgstr "%s eliminado"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "Preparándose para eliminar completamente %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "Se borró completamente %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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»"
+msgid "Can not write log (%s)"
+msgstr "No se puede escribir en %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"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "No se pudo crear FICHERO*"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "No se pudo bifurcar"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Hijo compresión"
+#: apt-pkg/deb/dpkgpm.cc:1687
+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»"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Error interno, no se pudo crear %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemas de dependencias - dejando sin instalar"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Falló la ES a subproceso/archivo"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"No se escribió un informe «apport» porque el mensaje de error indica que es "
+"un mensaje de error asociado a un fallo previo."
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "No se pudo leer mientras se computaba MD5"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"No se escribió un informe «apport» porque el mensaje de error indica que el "
+"error es de disco lleno"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Se produjo un problema al desligar %s"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"No se escribió un informe «apport» porque el mensaje de error indica un "
+"error de memoria excedida"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 #, 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 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!"
+"No se escribió un informe «apport» porque el mensaje de error indica que el "
+"error es de disco lleno"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"No se escribió un informe «apport» porque el mensaje de error indica un "
+"error de E/S de dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Error Interno, AllUpgrade rompió cosas"
 
 #~ 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 4293c0121..9379abad0 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,11 +7,11 @@ 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
-"Language: \n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,77 +98,77 @@ msgstr "Guztira erregistratutako lekua: "
 msgid "Package file %s is out of sync."
 msgstr "%s pakete fitxategia ez dago sinkronizatuta."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Zehazki eredu bat eman behar duzu."
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ezin da %s paketea lokalizatu"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Pakete Fitxategiak:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Pin duten Paketeak:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(ez da aurkitu)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Instalatuta: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Hautagaia: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Paketearen pin-a:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Bertsio taula:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -330,7 +330,7 @@ msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
@@ -358,7 +358,7 @@ msgstr "Ezin da deskarga direktorioa blokeatu"
 msgid "Must specify at least one package to fetch source for"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
@@ -384,7 +384,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ezin da %s(e)n duzun leku librea atzeman."
@@ -417,7 +417,7 @@ msgstr "Eskuratu %s iturburua\n"
 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Deskarga amaituta eta deskarga soileko moduan"
 
@@ -427,48 +427,48 @@ msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s: ez du eraikitze mendekotasunik.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -476,7 +476,7 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -484,14 +484,14 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -500,7 +500,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:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -508,30 +508,30 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Konektatzen -> %s.(%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -618,16 +618,20 @@ msgstr ""
 "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
 "                       APT honek Super Behiaren Ahalmenak ditu.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -636,6 +640,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -665,8 +670,9 @@ msgstr "%s bertsiorik berriena da jada.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s espero zen baina ez zegoen han"
@@ -864,7 +870,7 @@ msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Huts egin du"
 
@@ -910,7 +916,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du"
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
@@ -1042,91 +1048,181 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Konexioaren denbora muga gainditu da"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Goiburuen zain"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Okerreko goiburu-lerroa"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du."
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "http zerbitzariak barruti onarpena apurturik du"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Datu formatu ezezaguna"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Barne errorea"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Atzituta "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Hartu:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ez ikusi "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Lanean]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Medio Aldaketa: Mesedez sar\n"
+" '%s'\n"
+"izeneko diska '%s' gailuan eta enter sakatu\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Egiaztapen abisua gainidazten.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Zenbait pakete ezin dira egiaztatu"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Paketeak egiaztapen gabe instalatu?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Ezin da lortu %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Barne errorea, ez da ordenatzeaz amaitu"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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 "
@@ -1134,52 +1230,48 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Bai, egin esandakoa!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1190,19 +1282,19 @@ msgstr ""
 "Jarraitzeko, idatzi '%s' esaldia\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Abortatu."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Aurrera jarraitu nahi al duzu?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Fitxategi batzuk ezin izan dira deskargatu"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1210,19 +1302,19 @@ msgstr ""
 "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
 "--fix-missing aukerarekin saiatu?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Falta diren paketeak ezin dira zuzendu."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Abortatu instalazioa."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1232,15 +1324,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1258,15 +1350,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "Informazio honek arazoa konpontzen lagun dezake:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1280,7 +1372,7 @@ msgstr[1] ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1292,7 +1384,7 @@ msgstr[1] ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1311,7 +1403,7 @@ msgstr ""
 "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
 "zehaztu konponbide bat)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1323,68 +1415,68 @@ msgstr ""
 "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
 "Sarrerakoetan (Incoming) egoten jarraituko dute."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Hautsitako paketeak"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Iradokitako paketeak:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Gomendatutako paketeak:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1392,136 +1484,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Instalatuta]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Instalatuta]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Instalatuta]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Instalatuta]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "baina %s instalatuta dago"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "baina %s instalatzeko dago"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "baina ez da instalagarria"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "baina pakete birtuala da"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "baina ez dago instalatuta"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "baina ez da instalatuko"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " edo"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Ondorengo paketeak KENDUKO dira:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Ondorengo paketeak mantendu egin dira:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Ondorengo paketeak bertsio-berrituko dira:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (arrazoia: %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1529,27 +1601,27 @@ msgstr ""
 "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
 "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu berrinstalatuta, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu aurreko bertsiora itzulita, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ez erabat instalatuta edo kenduta.\n"
@@ -1558,7 +1630,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[B/e]"
 
@@ -1566,36 +1638,28 @@ msgstr "[B/e]"
 #. 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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1609,35 +1673,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Egiaztapen abisua gainidazten.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Zenbait pakete ezin dira egiaztatu"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Paketeak egiaztapen gabe instalatu?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Ezin da lortu %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1648,74 +1683,44 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Eginda"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atzituta "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Hartu:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ez ikusi "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Lanean]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Medio Aldaketa: Mesedez sar\n"
-" '%s'\n"
-"izeneko diska '%s' gailuan eta enter sakatu\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ezin da %s irakurri"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1791,36 +1796,427 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Eskuragarrien datuak biltzen"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Huts egin du hash-elementua lokalizatzean!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ezin da daturik lortu %s(e)tik"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Huts egin du desbideratzea lokalizatzean"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s : ezin da idatzi"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion-n barne errorea"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Pakete luzapenen zerrenda luzeegia da"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s"
+msgid "Error processing directory %s"
+msgstr "Errorea direktorioa prozesatzean %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Iturburu luzapenen zerrenda luzeegia da"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Errorea eduki fitxategiaren goiburua idaztean"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Desbideratzearen gehitze bikoitza: %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Errorea edukiak prozesatzean %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Ez dago bat datorren hautapenik"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Konfigurazio fitxategi bikoiztua: %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean"
+
+#: ftparchive/cachedb.cc:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
+
+#: ftparchive/cachedb.cc:94
+#, 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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ezin da ireki %s datu-base fitxategia: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Huts egin du %s(e)tik datuak lortzean"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Huts egin du %s esteka irakurtzean"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Artxiboak ez du kontrol erregistrorik"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Artxiboak ez du pakete eremurik"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s: ez du override sarrerarik\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s mantentzailea %s da, eta ez %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s: ez du jatorri gainidazketa sarrerarik\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Huts egin du %s izenaren ordez %s ipintzean"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1846,17 +2242,6 @@ msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da"
 msgid "The diversion path is too long"
 msgstr "Desbideratzearen bidea luzeegia da"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1885,30 +2270,36 @@ msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
 msgid "Unable to stat %s"
 msgstr "Ezin da daturik lortu %s(e)tik"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Ezin izan da %s fitxategia itxi"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Huts egin du hash-elementua lokalizatzean!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Huts egin du desbideratzea lokalizatzean"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion-n barne errorea"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Barne Errorea, ezin da %s atala kokatu"
+msgid "Double add of diversion %s -> %s"
+msgstr "Desbideratzearen gehitze bikoitza: %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Kontrol fitxategi ezin analizagarria"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Konfigurazio fitxategi bikoiztua: %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1956,199 +2347,52 @@ msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "'%s' pakete sistema ez da onartzen"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i erregistro grabaturik.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Barne Errorea, ezin da %s atala kokatu"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Kontrol fitxategi ezin analizagarria"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Egiaztapena ez dator bat"
-
-#: 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/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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Paketeen katxea hutsik"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Paketeen katxe fitxategia hondatuta dago"
-
-#: 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:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Paketeen katxe fitxategia hondatuta dago"
-
-#: 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:179
-msgid "The package cache was built for a different architecture"
-msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Mendekotasuna:"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Aurremendekotasuna:"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Iradokizuna:"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Gomendioa:"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Gatazka:"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Ordeztea:"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Zaharkitzea:"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Apurturik"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "garrantzitsua"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "beharrezkoa"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "estandarra"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "aukerakoa"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "estra"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
+msgid "List directory %spartial is missing."
+msgstr "%spartial zerrenda-direktorioa falta da."
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s metodoa ez da behar bezala abiarazi"
+msgid "Archives directory %spartial is missing."
+msgstr "%spartial artxibo direktorioa falta da."
 
-#: apt-pkg/acquire-worker.cc:455
-#, 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/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ezin da zerrenda direktorioa blokeatu"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "'%s' motako indize fitxategirik ez da onartzen"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Dependentzia zuhaitza eraikitzen"
-
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
+msgid "Retrieving file %li of %li"
+msgstr "%li fitxategia jasotzen %li-tik"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2168,35 +2412,35 @@ msgstr "Tamaina ez dator bat"
 msgid "Invalid file format"
 msgstr "Eragiketa baliogabea: %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2204,12 +2448,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2218,12 +2462,12 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea. (arkitektura falta delako)"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2231,163 +2475,108 @@ msgstr ""
 "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Katxearen bertsio sistema ez da bateragarria"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
+msgid "Is the package %s installed?"
+msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s metodoa ez da behar bezala abiarazi"
 
-#: 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/acquire-worker.cc:455
+#, 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/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/algorithms.cc:265
+#, 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/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/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/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/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
 
-#: 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/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/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/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"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Fitxategiaren erreferentziak biltzen"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Ezin izan da Iturburu zerrenda irakurri."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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"
+msgid "Release '%s' for '%s' was not found"
+msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "%s saltzaile blokeak ez du egiaztapen markarik"
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "%spartial zerrenda-direktorioa falta da."
+msgid "Couldn't find task '%s'"
+msgstr "Ezin izan da %s zeregina aurkitu"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "%spartial artxibo direktorioa falta da."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Ezin izan da %s paketea aurkitu"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Ezin izan da %s paketea aurkitu"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, 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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 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/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ezin da %s atzitu."
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, 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:444
+#: apt-pkg/cacheset.cc:647
 #, 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)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "%s fitxategia ezin izan da ireki"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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
@@ -2469,54 +2658,87 @@ msgstr "Jatorri zerrenda berria idazten\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Diskoarentzako jatorri sarrerak:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
+msgid "Unable to stat %s."
+msgstr "Ezin da %s atzitu."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Dependentzia zuhaitza eraikitzen"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Hautagaien bertsioak"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependentzi Sormena"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
+msgid "Wrote %i records.\n"
+msgstr "%i erregistro grabaturik.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ezin da %s pakete fitxategia analizatu (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
+
+#: 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 ""
+"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Egiaztapena ez dator bat"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2543,6 +2765,214 @@ msgstr "Lerro baliogabea desbideratze fitxategian: %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "'%s' pakete sistema ez da onartzen"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "%s fitxategia ezin izan da ireki"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Paketeen katxea hutsik"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Paketeen katxe fitxategia hondatuta dago"
+
+#: 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:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Paketeen katxe fitxategia hondatuta dago"
+
+#: 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:179
+msgid "The package cache was built for a different architecture"
+msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Mendekotasuna:"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Aurremendekotasuna:"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Iradokizuna:"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Gomendioa:"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Gatazka:"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Ordeztea:"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Zaharkitzea:"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Apurturik"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "garrantzitsua"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "beharrezkoa"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "estandarra"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "aukerakoa"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "estra"
+
+#: 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: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: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: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: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: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: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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
+
+#: 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:1316
+msgid "Collecting File Provides"
+msgstr "Fitxategiaren erreferentziak biltzen"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "'%s' motako indize fitxategirik ez da onartzen"
+
+#: 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 record in the preferences file %s, no Package header"
+msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2618,221 +3048,144 @@ msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
 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/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/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/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, 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:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Ezin izan da %s zeregina aurkitu"
-
-#: 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:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Ezin izan da %s paketea aurkitu"
+msgid "Unable to parse package file %s (1)"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "Ezin da %s pakete fitxategia analizatu (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"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/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "%s saltzaile blokeak ez du egiaztapen markarik"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "Ezin da atzitu %s muntatze puntua"
 
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Huts egin du CDROMa atzitzean"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "%s Instalatzen"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Ez da ezagutzen komando lerroko '%c' aukera [%s]."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "%s konfiguratzen"
+msgid "Command line option %s is not understood"
+msgstr "Ez da ulertzen komando lerroko %s aukera"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "%s kentzen"
+msgid "Command line option %s is not boolean"
+msgstr "Komando lerroko %s aukera ez da boolearra."
 
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s guztiz ezabatu da"
+#: 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/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
+"%s aukera: konfigurazio elementuaren zehaztapenak =<val> eduki behar du."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "%s aukerak osoko argumentu bat behar du, eta ez '%s'"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "'%s' direktorioa falta da"
-
-#: 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"
+msgid "Option '%s' is too long"
+msgstr "'%s' aukera luzeegia da"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "%s prestatzen"
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "%s irekitzen"
+msgid "Invalid operation %s"
+msgstr "Eragiketa baliogabea: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "%s konfiguratzeko prestatzen"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Mota ezezaguneko laburtzapena: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "%s Instalatuta"
+msgid "Opening configuration file %s"
+msgstr "%s konfigurazio fitxategia irekitzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s kentzeko prestatzen"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "%s kendurik"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Sintaxi errorea %s:%u: Gaizki eratutako"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s guztiz ezabatzeko prestatzen"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s guztiz ezabatu da"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ezin da zerrenda direktorioa blokeatu"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2950,54 +3303,11 @@ msgstr "Arazoa fitxategia desestekatzean"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Eginda"
-
-#. 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"
+msgid "No keyring installed in %s."
+msgstr "Abortatu instalazioa."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3053,518 +3363,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta"
+msgid "%c%s... Error!"
+msgstr "%c%s... Errorea!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, 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"
+msgid "%c%s... Done"
+msgstr "%c%s... Eginda"
 
-#: 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"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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."
+msgid "%c%s... %u%%"
+msgstr "%c%s... Eginda"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "%s aukerak argumentu bat behar du."
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "%lih %limin %lis"
 msgstr ""
-"%s aukera: konfigurazio elementuaren zehaztapenak =<val> eduki behar du."
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "%s aukerak osoko argumentu bat behar du, eta ez '%s'"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "'%s' aukera luzeegia da"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua."
+msgid "Selection %s not found"
+msgstr "%s hautapena ez da aurkitu"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Pakete luzapenen zerrenda luzeegia da"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Errorea direktorioa prozesatzean %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Iturburu luzapenen zerrenda luzeegia da"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Errorea eduki fitxategiaren goiburua idaztean"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ezin da zerrenda direktorioa blokeatu"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Errorea edukiak prozesatzean %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Ez dago bat datorren hautapenik"
 
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, 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:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
-"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, "
-"mesedez datubasea ezabatu eta birsortu."
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ezin da ireki %s datu-base fitxategia: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Huts egin du %s esteka irakurtzean"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Artxiboak ez du kontrol erregistrorik"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Ezin da kurtsorerik eskuratu"
-
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Ezin da %s direktorioa irakurri\n"
+msgid "Installing %s"
+msgstr "%s Instalatzen"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, 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 "
+msgid "Configuring %s"
+msgstr "%s konfiguratzen"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Huts egin du %s ebaztean"
+msgid "Removing %s"
+msgstr "%s kentzen"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Huts egin dute zuhaitz-urratsek"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s guztiz ezabatu da"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "Huts egin du %s irekitzean"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Huts egin du %s esteka irakurtzean"
+msgid "Directory '%s' missing"
+msgstr "'%s' direktorioa falta da"
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Huts egin du %s desestekatzean"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "%s fitxategia ezin izan da ireki"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
+msgid "Preparing %s"
+msgstr "%s prestatzen"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-en mugara (%sB) heldu da.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Artxiboak ez du pakete eremurik"
+msgid "Unpacking %s"
+msgstr "%s irekitzen"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s: ez du override sarrerarik\n"
+msgid "Preparing to configure %s"
+msgstr "%s konfiguratzeko prestatzen"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s mantentzailea %s da, eta ez %s\n"
+msgid "Installed %s"
+msgstr "%s Instalatuta"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s: ez du jatorri gainidazketa sarrerarik\n"
+msgid "Preparing for removal of %s"
+msgstr "%s kentzeko prestatzen"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Huts egin du memoria esleitzean"
+msgid "Removed %s"
+msgstr "%s kendurik"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "%s guztiz ezabatzeko prestatzen"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "%s guztiz ezabatu da"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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"
+msgid "Can not write log (%s)"
+msgstr "%s : ezin da idatzi"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Huts egin du FILE* sortzean"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Huts egin du sardetzean"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Konprimatu Umeak"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Barne Errorea, Huts %s sortzerakoan"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Huts egin du MD5 konputatzean"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Arazoa %s desestekatzean"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
 
 #~ 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 c1c08186b..cb23ace35 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -98,75 +98,75 @@ msgstr "Käytetty tila yhteensä: "
 msgid "Package file %s is out of sync."
 msgstr "Pakettitiedosto %s ei ole ajan tasalla."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "On annettava täsmälleen yksi lauseke"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Pakettia %s ei löydy"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Pakettitiedostot:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Paketit joissa tunniste:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(ei löydy)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Asennettu: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Ehdokas: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Paketin tunnistenumero: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Versiotaulukko:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -327,7 +327,7 @@ msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
@@ -355,7 +355,7 @@ msgstr "Noutokansiota ei saatu lukittua"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
@@ -381,7 +381,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
@@ -414,7 +414,7 @@ msgstr "Nouda lähdekoodi %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Nouto on valmis ja määrätty vain nouto"
 
@@ -423,48 +423,48 @@ msgstr "Nouto on valmis ja määrätty vain nouto"
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -472,7 +472,7 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -480,14 +480,14 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,7 +496,7 @@ msgstr ""
 "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
 "ei vastaa versioriippuvuuksia"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -504,30 +504,30 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Avataan yhteys %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -613,16 +613,20 @@ msgstr ""
 "lisätietoja ja lisää valitsimia.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -631,6 +635,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -660,8 +665,9 @@ msgstr "%s on jo uusin versio.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Odotettiin %s, mutta sitä ei ollut"
@@ -855,7 +861,7 @@ msgstr "Pistoketta ei voitu luoda"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Ei onnistunut"
 
@@ -901,7 +907,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
@@ -1034,144 +1040,230 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Select ei toiminut"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Odotetaan otsikoita"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Virheellinen otsikkorivi"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "HTTP-palvelimen arvoaluetuki on rikki"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Tuntematon päiväysmuoto"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Löytyi "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Nouda:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Siv "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Vrhe "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Työskennellään]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Taltion vaihto: Pistä levy \n"
+"\"%s\"\n"
+"asemaan \"%s\" ja paina Enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Varoitus varmistamisesta on ohitettu.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Asennetaanko nämä paketit ilman todennusta?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Kyllä, tee kuten käsketään!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1182,19 +1274,19 @@ msgstr ""
 "Jatka kirjoittamalla \"%s\"\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Keskeytä."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Haluatko jatkaa?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Joidenkin tiedostojen nouto ei onnistunut"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1202,19 +1294,19 @@ msgstr ""
 "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai "
 "kokeile --fix-missing?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Puuttuvia paketteja ei voi korjata."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Asennus keskeytetään."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1224,16 +1316,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1251,15 +1343,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1273,7 +1365,7 @@ msgstr[1] ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1285,7 +1377,7 @@ msgstr[1] ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1304,7 +1396,7 @@ msgstr ""
 "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
 "ilmanpaketteja (tai ratkaise itse)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1315,68 +1407,68 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Rikkinäiset paketit"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Ehdotetut paketit:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Suositellut paketit:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Valittiin versio %s (%s) paketille %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Valittiin versio %s (%s) paketille %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1384,136 +1476,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Asennettu]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Asennettu]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Asennettu]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Asennettu]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "mutta %s on asennettu"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mutta %s on merkitty asennettavaksi"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "mutta ei ole asennuskelpoinen"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "mutta on näennäispaketti"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "mutta ei ole asennettu"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "mutta ei ole merkitty asennettavaksi"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " tai"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Seuraavat UUDET paketit asennetaan:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Seuraavat paketit POISTETAAN:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Nämä paketit on jätetty odottamaan:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Nämä paketit päivitetään:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Nämä paketit VARHENNETAAN:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Seuraavat pysytetyt paketit muutetaan:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (syynä %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1521,27 +1593,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu päivitetty, %lu uutta asennusta, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu uudelleen asennettua, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu varhennettua, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
@@ -1550,7 +1622,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[K/e]"
 
@@ -1558,36 +1630,28 @@ msgstr "[K/e]"
 #. 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "K"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1601,35 +1665,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Varoitus varmistamisesta on ohitettu.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Asennetaanko nämä paketit ilman todennusta?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1640,74 +1675,44 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Komento update ei käytä parametreja"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Valmis"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Löytyi "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Nouda:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Siv "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Vrhe "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Työskennellään]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Taltion vaihto: Pistä levy \n"
-"\"%s\"\n"
-"asemaan \"%s\" ja paina Enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Tiedostoa %s ei voi lukea"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1784,36 +1789,431 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yhdistetään saatavuustiedot"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Hajautusalkiota ei löytynyt!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Tiedostolle %s ei toimi stat"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Korvautuksen varaus ei onnistunut"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion: sisäinen virhe"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Paketin laajennuslista on liian pitkä"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Tapahtui virhe käsiteltäessa kansiota %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Lähteiden laajennuslista on liian pitkä"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr ""
+"Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Korvautuksen kaksoislisäys %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Mitkään valinnat eivät täsmänneet"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Asetustiedoston kaksoiskappale %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Tietokanta on vanha, yritetään päivittää %s"
+
+#: ftparchive/cachedb.cc:94
+#, 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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Tiedostolle %s ei toimi stat"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "readlink %s ei onnistunut"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arkistolla ei ole ohjaustietuetta"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Arkistossa ei ollut pakettikenttää"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s:llä ei ole poikkeustietuetta\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s ylläpitäjä on %s eikä %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s:llä ei ole poikkeustietuetta\n"
+
+#: ftparchive/writer.cc:710
+#, 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:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1839,17 +2239,6 @@ msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s"
 msgid "The diversion path is too long"
 msgstr "Korvautuspolku on liian pitkä"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1878,30 +2267,36 @@ msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
 msgid "Unable to stat %s"
 msgstr "Tiedostolle %s ei toimi stat"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Tiedoston %s sulkeminen ei onnistunut"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Hajautusalkiota ei löytynyt!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Korvautuksen varaus ei onnistunut"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion: sisäinen virhe"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\""
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy"
+msgid "Double add of diversion %s -> %s"
+msgstr "Korvautuksen kaksoislisäys %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ohjaustiedosto ei jäsenny"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Asetustiedoston kaksoiskappale %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1949,201 +2344,52 @@ msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Kirjoitettiin %i tietuetta.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Ohjaustiedosto ei jäsenny"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Kohteen %s tarkistussumma ei täsmää"
-
-#: 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/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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Pakettivarasto on tyhjä"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Pakettivarasto on turmeltunut"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "Pakettivaraston versio on yhteensopimaton"
-
-#: 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: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:179
-msgid "The package cache was built for a different architecture"
-msgstr "Pakettivarasto on tehty muulle arkkitehtuurille"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Riippuvuudet"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Esiriippuvuudet"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Ehdotukset"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Suosittelut"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Ristiriidat"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Korvaavuudet"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Täydet korvaavuudet"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Rikkoo"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "tärkeä"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "välttämätön"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "perus"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "valinnainen"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "ylimääräinen"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Menetelmän ajuria %s ei löytynyt"
+msgid "List directory %spartial is missing."
+msgstr "Luettelokansio %spartial puuttuu."
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Menetelmä %s ei käynnistynyt oikein"
+msgid "Archives directory %spartial is missing."
+msgstr "Arkistokansio %spartial puuttuu."
 
-#: apt-pkg/acquire-worker.cc:455
-#, 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/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Luettelokansiota ei voitu lukita"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Muodostetaan riippuvuussuhteiden puu"
-
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Tilatiedoston %s avaaminen ei onnistunut"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
+msgid "Retrieving file %li of %li"
+msgstr "Noudetaan tiedosto %li / %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2163,35 +2409,35 @@ msgstr "Koko ei täsmää"
 msgid "Invalid file format"
 msgstr "Virheellinen toiminto %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2199,12 +2445,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2213,12 +2459,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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2226,163 +2472,108 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttää."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Menetelmän ajuria %s ei löytynyt"
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
+msgid "Is the package %s installed?"
+msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Menetelmä %s ei käynnistynyt oikein"
 
-#: 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/acquire-worker.cc:455
+#, 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/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/algorithms.cc:265
+#, 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/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/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/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/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/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "stat ei toiminut lähdepakettiluettelolle %s"
+#: 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/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/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"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Kootaan tiedostojen tarjoamistietoja"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Toimittajan lohkosta %s puuttuu sormenjälki"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Luettelokansio %spartial puuttuu."
+msgid "Couldn't find task '%s'"
+msgstr "Tehtävää %s ei löytynyt"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkistokansio %spartial puuttuu."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Pakettia %s ei löytynyt"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Pakettia %s ei löytynyt"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, 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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 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/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "stat %s ei onnistu."
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, 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:444
+#: apt-pkg/cacheset.cc:647
 #, 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)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Tiedostoa %s ei voitu avata"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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
@@ -2464,53 +2655,88 @@ msgstr "Kirjoitetaan uusi lähdeluettelo\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "stat %s ei onnistu."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Muodostetaan riippuvuussuhteiden puu"
 
-#: 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: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 "Failed to open StateFile %s"
+msgstr "Tilatiedoston %s avaaminen ei onnistunut"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
+msgid "Wrote %i records.\n"
+msgstr "Kirjoitettiin %i tietuetta.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Kohteen %s tarkistussumma ei täsmää"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2537,6 +2763,214 @@ msgstr "Virheellinen rivi korvautustiedostossa: %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Tiedostoa %s ei voitu avata"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Pakettivarasto on tyhjä"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Pakettivarasto on turmeltunut"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "Pakettivaraston versio on yhteensopimaton"
+
+#: 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: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:179
+msgid "The package cache was built for a different architecture"
+msgstr "Pakettivarasto on tehty muulle arkkitehtuurille"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Riippuvuudet"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Esiriippuvuudet"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Ehdotukset"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Suosittelut"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Ristiriidat"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Korvaavuudet"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Täydet korvaavuudet"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Rikkoo"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "tärkeä"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "välttämätön"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "perus"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "valinnainen"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "ylimääräinen"
+
+#: 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: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: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: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: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: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: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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "stat ei toiminut lähdepakettiluettelolle %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 "Luetaan pakettiluetteloita"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Kootaan tiedostojen tarjoamistietoja"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
+
+#: 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 record in the preferences file %s, no Package header"
+msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2612,221 +3046,143 @@ msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
 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/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
+#: 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/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
-
-#: 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:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Pakettia %s ei löytynyt"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Pakettia %s ei löytynyt"
+msgid "Unable to parse package file %s (1)"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"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/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Toimittajan lohkosta %s puuttuu sormenjälki"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "Komento stat ei toiminut liitoskohdalle %s"
 
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Komento stat ei toiminut rompulle"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "Asennetaan %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Komentorivin valitsin \"%c\" [%s] on tuntematon."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "Tehdään asetukset: %s"
+msgid "Command line option %s is not understood"
+msgstr "Komentorivin valitsin %s on tuntematon"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "Poistetaan %s"
-
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s poistettiin kokonaan"
+msgid "Command line option %s is not boolean"
+msgstr "Komentorivin valitsin %s ei ole totuusarvoinen"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Option %s requires an argument."
+msgstr "Valitsin %s tarvitsee parametrin"
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Suoritetaan jälkiasennusliipaisin %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Valitsin %s: Asetusarvon määrityksessä on oltava =<arvo>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Kansio \"%s\" puuttuu."
-
-#: 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"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Valitsin %s tarvitsee kokonaislukuparametrin, ei \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Preparing %s"
-msgstr "Valmistellaan %s"
+msgid "Option '%s' is too long"
+msgstr "Valitsin \"%s\" on liian pitkä"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Unpacking %s"
-msgstr "Puretaan %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Arvo %s on tuntematon, yritä tosi tai epätosi."
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Valmistaudutaan tekemään asetukset: %s"
+msgid "Invalid operation %s"
+msgstr "Virheellinen toiminto %s"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Installed %s"
-msgstr "%s asennettu"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Tuntematon tyypin lyhenne: \"%c\""
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Valmistaudutaan poistamaan %s"
+msgid "Opening configuration file %s"
+msgstr "Avataan asetustiedosto %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Removed %s"
-msgstr "%s poistettu"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä."
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Valmistaudutaan poistamaan %s kokonaan"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s poistettiin kokonaan"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa"
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\""
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Luettelokansiota ei voitu lukita"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2941,54 +3297,11 @@ msgstr "Pulmia tehtäessä tiedostolle unlink"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Valmis"
-
-#. 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"
+msgid "No keyring installed in %s."
+msgstr "Asennus keskeytetään."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3042,521 +3355,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä"
+msgid "%c%s... Error!"
+msgstr "%c%s... Virhe!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, 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"
+msgid "%c%s... Done"
+msgstr "%c%s... Valmis"
 
-#: 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"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Valmis"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Valitsin %s tarvitsee parametrin"
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Valitsin %s: Asetusarvon määrityksessä on oltava =<arvo>."
+msgid "%lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Valitsin %s tarvitsee kokonaislukuparametrin, ei \"%s\""
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Valitsin \"%s\" on liian pitkä"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Arvo %s on tuntematon, yritä tosi tai epätosi."
+msgid "Selection %s not found"
+msgstr "Valintaa %s ei löydy"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Paketin laajennuslista on liian pitkä"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Tapahtui virhe käsiteltäessa kansiota %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lähteiden laajennuslista on liian pitkä"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr ""
-"Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Luettelokansiota ei voitu lukita"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Mitkään valinnat eivät täsmänneet"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Tietokanta on vanha, yritetään päivittää %s"
 
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
-"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, "
-"on tietokanta poistettava ja luotava uudelleen."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
 
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink %s ei onnistunut"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arkistolla ei ole ohjaustietuetta"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Kohdistinta ei saada"
-
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Kansiota %s ei voi lukea\n"
+msgid "Installing %s"
+msgstr "Asennetaan %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, 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ä "
+msgid "Configuring %s"
+msgstr "Tehdään asetukset: %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Osoitteen %s selvitys ei onnistunut"
+msgid "Removing %s"
+msgstr "Poistetaan %s"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Puun läpikäynti ei onnistunut"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s poistettiin kokonaan"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "Tiedoston %s avaaminen ei onnistunut"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "Suoritetaan jälkiasennusliipaisin %s"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink %s ei onnistunut"
+msgid "Directory '%s' missing"
+msgstr "Kansio \"%s\" puuttuu."
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "unlink %s ei onnistunut"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Tiedostoa %s ei voitu avata"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Linkin %s -> %s luonti ei onnistunut"
+msgid "Preparing %s"
+msgstr "Valmistellaan %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLinkin yläraja %st saavutettu.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arkistossa ei ollut pakettikenttää"
+msgid "Unpacking %s"
+msgstr "Puretaan %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s:llä ei ole poikkeustietuetta\n"
+msgid "Preparing to configure %s"
+msgstr "Valmistaudutaan tekemään asetukset: %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s ylläpitäjä on %s eikä %s\n"
+msgid "Installed %s"
+msgstr "%s asennettu"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s:llä ei ole poikkeustietuetta\n"
+msgid "Preparing for removal of %s"
+msgstr "Valmistaudutaan poistamaan %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Muistin varaaminen ei onnistunut"
+msgid "Removed %s"
+msgstr "%s poistettu"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "Valmistaudutaan poistamaan %s kokonaan"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "%s poistettiin kokonaan"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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"
+msgid "Can not write log (%s)"
+msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE* luominen ei onnistunut"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork ei onnistunut"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Compress-lapsiprosessi"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ei kelpaa DEB-paketiksi."
diff --git a/po/fr.po b/po/fr.po
index 3e9a87190..f3b69a800 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.5\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n > 1;\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
 
 #: cmdline/apt-cache.cc:149
 #, c-format
@@ -98,74 +98,74 @@ msgstr "Total de l'espace attribué : "
 msgid "Package file %s is out of sync."
 msgstr "Fichier %s désynchronisé."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Vous devez fournir au moins un motif de recherche"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Fichiers du paquet :"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Paquets épinglés :"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(non trouvé)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Installé : "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Candidat : "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(aucun)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Épinglage de paquet : "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr " Table de version :"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -342,7 +342,7 @@ msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s passé en « installé manuellement ».\n"
@@ -374,7 +374,7 @@ msgstr "Impossible de verrouiller le répertoire de téléchargement"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossible de trouver une source de paquet pour %s"
@@ -407,7 +407,7 @@ 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:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de déterminer l'espace disponible sur %s"
@@ -440,7 +440,7 @@ msgstr "Récupération des sources %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Échec lors de la récupération de quelques archives."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
 
@@ -449,32 +449,32 @@ msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de décompactage « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Échec du processus fils"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -484,17 +484,17 @@ msgstr ""
 "consulter la section à propos de APT::Architectures dans la page de manuel "
 "apt.conf(5)."
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de dépendance de construction.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -503,7 +503,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:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -512,14 +512,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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -528,7 +528,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -537,31 +537,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dépendances de construction"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Journal des modifications pour %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -651,16 +651,20 @@ msgstr ""
 "apt.conf(5) pour plus d'informations et d'options.\n"
 "                      Cet APT a les « Super Cow Powers »\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "Vous devez spécifier au moins un paquet source"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -669,6 +673,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -698,8 +703,9 @@ msgstr "%s était déjà marqué comme figé (« hold »).\n"
 msgid "%s was already not hold.\n"
 msgstr "%s était déjà marqué comme non figé.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "A attendu %s mais il n'était pas présent"
@@ -922,7 +928,7 @@ 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Échec"
 
@@ -968,7 +974,7 @@ msgstr "Délai de connexion au port de données dépassé"
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problème de hachage du fichier"
 
@@ -1106,92 +1112,182 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Les fichiers vides ne peuvent être des archives valables"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Erreur d'écriture sur le fichier"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Erreur d'écriture sur un fichier"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Sélection défaillante"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Délai de connexion dépassé"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Erreur d'écriture du fichier de sortie"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Attente des fichiers d'en-tête"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Mauvaise ligne d'en-tête"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 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:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Ce serveur http possède un support des limites non-valide"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Format de date inconnu"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Mauvais en-tête de donnée"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Atteint "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Réception de : "
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [En cours]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Changement de support : veuillez insérer le disque\n"
+"« %s »\n"
+"dans le lecteur « %s » et appuyez sur la touche Entrée\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Avertissement d'authentification ignoré.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Certains paquets n'ont pas pu être authentifiés"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Faut-il installer ces paquets sans vérification ?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erreur interne. Le tri a été interrompu."
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Étrangement, les tailles ne correspondent pas. Veuillez le signaler par "
@@ -1199,21 +1295,21 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1221,21 +1317,17 @@ 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
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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 "
@@ -1245,11 +1337,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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Oui, faites ce que je vous dis !"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1260,19 +1352,19 @@ msgstr ""
 "Pour continuer, tapez la phrase « %s »\n"
 " ?]"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Annulation."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Souhaitez-vous continuer ?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu être téléchargés."
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1280,20 +1372,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:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Impossible de corriger le fait que les paquets manquent."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Annulation de l'installation."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1307,18 +1399,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1337,16 +1429,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1358,7 +1450,7 @@ msgstr[1] ""
 "Les paquets suivants ont été installés automatiquement et ne sont plus "
 "nécessaires :"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1368,7 +1460,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 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."
@@ -1387,7 +1479,7 @@ msgstr ""
 "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
 "(ou indiquez une solution)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1399,73 +1491,73 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Paquets défectueux"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Les paquets supplémentaires suivants seront installés : "
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Paquets suggérés :"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Paquets recommandés :"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s ignoré : il n'est pas installé et seules des mises à jour ont été "
 "demandées.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s est déjà la plus récente version disponible.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Version choisie « %s » (%s) pour « %s »\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Le paquet « %s » n'est pas installé, et ne peut donc être supprimé. Peut-"
 "être vouliez-vous écrire « %s » ?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Le paquet « %s » n'est pas installé, et ne peut donc être supprimé\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1473,136 +1565,122 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Installé]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Installé]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Installé]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Installé]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "mais %s est installé"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mais %s devra être installé"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "mais il n'est pas installable"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "mais c'est un paquet virtuel"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "mais il n'est pas installé"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "mais ne sera pas installé"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " ou"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Les NOUVEAUX paquets suivants seront installés :"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Les paquets suivants seront ENLEVÉS :"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Les paquets suivants ont été conservés :"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Les paquets suivants seront mis à jour :"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Les paquets retenus suivants seront changés :"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (en raison de %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1611,27 +1689,27 @@ msgstr ""
 "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
 "que vous êtes en train de faire."
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu mis à jour, %lu nouvellement installés, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu réinstallés, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu remis à une version inférieure, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu partiellement installés ou enlevés.\n"
@@ -1640,7 +1718,7 @@ msgstr "%lu partiellement installés ou enlevés.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[O/n]"
 
@@ -1648,36 +1726,28 @@ msgstr "[O/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "O"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1691,41 +1761,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avertissement d'authentification ignoré.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Certains paquets n'ont pas pu être authentifiés"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Faut-il installer ces paquets sans vérification ?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1736,74 +1771,44 @@ msgstr "Impossible de changer le nom %s en %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: 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-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Fait"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atteint "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Réception de : "
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [En cours]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Changement de support : veuillez insérer le disque\n"
-"« %s »\n"
-"dans le lecteur « %s » et appuyez sur la touche Entrée\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossible de lire %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1880,36 +1885,435 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusion des informations disponibles"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode appelé sur un nœud toujours lié"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Impossible de situer l'élément haché !"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Impossible de statuer pour %s."
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Échec lors de l'allocation de la déviation"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Impossible d'écrire sur %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Erreur interne dans AddDiversion"
+#: 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é ?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "La liste d'extension du paquet est trop longue"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Erreur lors du traitement du répertoire %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "La liste d'extension des sources est trop grande"
+
+#: ftparchive/apt-ftparchive.cc:401
+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:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Addition double d'une déviation %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Erreur du traitement du contenu %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Aucune sélection ne correspond"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Fichier de configuration en double %s/%s"
+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:65
+#, 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:83
+#, 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:94
+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:99
+#, 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:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Impossible de statuer %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Impossible de lire le lien %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "L'archive n'a pas d'enregistrement de contrôle"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "L'archive ne possède pas de champ de paquet"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "%s ne possède pas d'entrée « override »\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr " le responsable de %s est %s et non %s\n"
+
+#: ftparchive/writer.cc:706
+#, 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:710
+#, 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:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Impossible de changer le nom %s en %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1935,17 +2339,6 @@ msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%
 msgid "The diversion path is too long"
 msgstr "Le chemin de déviation est trop long"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1974,30 +2367,36 @@ msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
 msgid "Unable to stat %s"
 msgstr "Impossible de statuer pour %s."
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode appelé sur un nœud toujours lié"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Échec de clôture du fichier %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Impossible de situer l'élément haché !"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Échec lors de l'allocation de la déviation"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Erreur interne dans AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, 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"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Erreur interne, ne peut localiser la partie %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Addition double d'une déviation %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Fichier de contrôle non traitable"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Fichier de configuration en double %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -2045,203 +2444,52 @@ msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Exécution de dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Le système de paquet « %s » n'est pas supporté"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i enregistrements écrits.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Ce n'est pas une archive DEB valide,  partie « %s » manquante"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Erreur interne, ne peut localiser la partie %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Fichier de contrôle non traitable"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Somme de contrôle de hachage incohérente pour %s"
-
-#: apt-pkg/cachefile.cc:94
-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: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."
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Cache des paquets vide"
-
-#: 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: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: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."
+msgid "List directory %spartial is missing."
+msgstr "Le répertoire %spartial pour les listes n'existe pas."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Dépend"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Pré-Dépend"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Suggère"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Recommande"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Est en conflit avec"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Remplace"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Rend obsolète"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Casse"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Améliore"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "important"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "nécessaire"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standard"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "optionnel"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "supplémentaire"
+msgid "Archives directory %spartial is missing."
+msgstr "Le répertoire d'archive %spartial n'existe pas."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
+msgid "Unable to lock directory %s"
+msgstr "Impossible de verrouiller le répertoire %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, 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:169
-#, 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:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Le type de fichier d'index « %s » n'est pas accepté"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'état %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Téléchargement du fichier %li sur %li (%s restant)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'écriture du fichier d'état temporaire %s"
+msgid "Retrieving file %li of %li"
+msgstr "Téléchargement du fichier %li sur %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2261,7 +2509,7 @@ msgstr "Taille incohérente"
 msgid "Invalid file format"
 msgstr "L'opération %s n'est pas valable"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2270,18 +2518,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2290,12 +2538,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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2306,12 +2554,12 @@ msgstr ""
 "GPG : %s : %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Erreur de GPG : %s : %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2320,14 +2568,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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2335,181 +2583,128 @@ msgstr ""
 "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
 "pour le paquet %s."
 
-#: 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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Erreur apparue lors du traitement de %s (%s%d)"
-
-#: 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: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."
+msgid "The method driver %s could not be found."
+msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
 
-#: 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/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/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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "La méthode %s n'a pas démarré correctement"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
-"fichiers"
+"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
+"touche Entrée."
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Impossible de localiser la liste des paquets sources %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 "Lecture des listes de paquets"
+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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Assemblage des fichiers listés dans les champs Provides"
+#: 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Impossible d'écrire sur %s"
+#: 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/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou "
+"lus."
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
+#: 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."
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Le répertoire %spartial pour les listes n'existe pas."
+#: 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/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Le répertoire d'archive %spartial n'existe pas."
+msgid "Release '%s' for '%s' was not found"
+msgstr "La version  « %s » de « %s » est introuvable"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossible de verrouiller le répertoire %s"
+msgid "Version '%s' for '%s' was not found"
+msgstr "La version « %s » de « %s » n'a pu être trouvée"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Téléchargement du fichier %li sur %li (%s restant)"
+msgid "Couldn't find task '%s'"
+msgstr "Impossible de trouver la tâche « %s »"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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."
+msgid "Couldn't find any package by regex '%s'"
 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."
+"Impossible de trouver de paquet correspondant à l'expression rationnelle "
+"« %s »"
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
 msgstr ""
-"Vous devez insérer quelques adresses « sources » dans votre sources.list"
+"Impossible de trouver de paquet correspondant à l'expression rationnelle "
+"« %s »"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Impossible de localiser %s."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
-"La valeur « %s » n'est pas valable pour APT::Default-Release car cette "
-"version ne fait pas partie des sources disponibles."
+"Impossible de choisir une version installée ou candidate du paquet « %s » "
+"qui n'en n'a aucune"
 
-#: apt-pkg/policy.cc:422
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 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"
+"Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
+"paquet virtuel"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 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:503 apt-pkg/packagemanager.cc:533
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Impossible de configurer « %s »."
+"Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"Impossible de choisir la version installée du paquet « %s » qui n'est pas "
+"installé"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2593,57 +2788,88 @@ msgstr "Écriture de la nouvelle liste de sources\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Les entrées de listes de sources pour ce disque sont :\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Impossible de localiser %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construction de l'arbre des dépendances"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Versions possibles"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "Impossible d'ouvrir le fichier d'état %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'écriture du fichier d'état temporaire %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Envoi du scénario au solveur"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Envoi d'une requête au solveur"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Préparation à la réception de la solution"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr "Échec du solveur externe sans message d'erreur adapté"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Exécu tion du solveur externe"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Impossible de traiter le fichier %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "%i enregistrements écrits.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Impossible de traiter le fichier %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Somme de contrôle de hachage incohérente pour %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2670,6 +2896,231 @@ msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrée « Date » non valable dans le fichier Release %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Le système de paquet « %s » n'est pas supporté"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Exécution de dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Impossible de configurer « %s »."
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Cache des paquets vide"
+
+#: 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: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: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: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: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:321
+msgid "Depends"
+msgstr "Dépend"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Pré-Dépend"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Suggère"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Recommande"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Est en conflit avec"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Remplace"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Rend obsolète"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Casse"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Améliore"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "important"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "nécessaire"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standard"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "optionnel"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "supplémentaire"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Assemblage des fichiers listés dans les champs Provides"
+
+#: 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/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/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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2757,249 +3208,147 @@ 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/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: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:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Impossible de trouver la tâche « %s »"
-
-#: 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:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
-"Impossible de trouver de paquet correspondant à l'expression rationnelle "
-"« %s »"
+"Vous devez insérer quelques adresses « sources » dans votre sources.list"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:140
 #, 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"
+msgid "Unable to parse package file %s (1)"
+msgstr "Impossible de traiter le fichier %s (1)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Impossible de choisir une version installée ou candidate du paquet « %s » "
-"qui n'en n'a aucune"
+msgid "Unable to parse package file %s (2)"
+msgstr "Impossible de traiter le fichier %s (2)"
 
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+#: 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 ""
-"Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
-"paquet virtuel"
+"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/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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é"
+msgid "Unable to stat the mount point %s"
+msgstr "Impossible de localiser le point de montage %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "Installation de %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Impossible d'accéder au cédérom."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "Configuration de %s"
+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/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Suppression de %s"
+msgid "Command line option %s is not understood"
+msgstr "L'option %s de la ligne de commande n'est pas reconnue"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "Suppression complète de %s"
+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/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Disparition de %s constatée"
+msgid "Option %s requires an argument."
+msgstr "L'option %s nécessite un paramètre."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Exécution des actions différées (« trigger ») de %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Option %s : l'item configuration doit être spécifiée avec un =<val>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Répertoire %s inexistant"
+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/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Impossible d'ouvrir le fichier « %s »"
+msgid "Option '%s' is too long"
+msgstr "L'option « %s » est trop longue"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Préparation de %s"
+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/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Décompression de %s"
+msgid "Invalid operation %s"
+msgstr "L'opération %s n'est pas valable"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Préparation de la configuration de %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Type d'abréviation non reconnue : « %c »"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "%s installé"
+msgid "Opening configuration file %s"
+msgstr "Ouverture du fichier de configuration %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Préparation de la suppression de %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "%s supprimé"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Erreur syntaxique %s:%u : balise mal formée"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Préparation de la suppression complète de %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s complètement supprimé"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "L'opération a été interrompue avant de se terminer"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "problème de dépendances : laissé non configuré"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-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:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-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:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
+"Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au "
+"niveau le plus haut"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Impossible de verrouiller le répertoire d'administration (%s). Il est "
-"possible qu'un autre processus l'utilise."
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les "
-"privilèges du superutilisateur ?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"dpkg a été interrompu. Il est nécessaire d'utiliser « %s » pour corriger le "
-"problème."
+"Erreur de syntaxe %s:%u : la directive « clear » a besoin d'un arbre "
+"d'options comme paramètre"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Non verrouillé"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3122,54 +3471,11 @@ msgstr "Problème de suppression du lien %s"
 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%%"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "La sélection %s n'a pu être trouvée"
+msgid "No keyring installed in %s."
+msgstr "Pas de porte-clés installé dans %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3228,529 +3534,234 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Command line option %s is not understood"
-msgstr "L'option %s de la ligne de commande n'est pas reconnue"
+msgid "%c%s... Error!"
+msgstr "%c%s... Erreur !"
 
-#: apt-pkg/contrib/cmndline.cc:168
+#: apt-pkg/contrib/progress.cc:150
 #, 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"
+msgid "%c%s... Done"
+msgstr "%c%s... Fait"
 
-#: 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/progress.cc:181
+msgid "..."
+msgstr "…"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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>."
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, 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 »"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "L'option « %s » est trop longue"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, 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."
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "La liste d'extension du paquet est trop longue"
+msgid "%lis"
+msgstr "%lis"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Erreur lors du traitement du répertoire %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "La liste d'extension des sources est trop grande"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu"
+msgid "Selection %s not found"
+msgstr "La sélection %s n'a pu être trouvée"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Erreur du traitement du contenu %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:841
-msgid "No selections matched"
-msgstr "Aucune sélection ne correspond"
+"Impossible de verrouiller le répertoire d'administration (%s). Il est "
+"possible qu'un autre processus l'utilise."
 
-#: ftparchive/apt-ftparchive.cc:919
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Some files are missing in the package file group `%s'"
+msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
-"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Base de données corrompue, fichier renommé en %s.old"
+"Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les "
+"privilèges du superutilisateur ?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, 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:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:99
-#, 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:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Impossible de lire le lien %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "L'archive n'a pas d'enregistrement de contrôle"
-
-#: ftparchive/cachedb.cc:594
-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"
+"dpkg a été interrompu. Il est nécessaire d'utiliser « %s » pour corriger le "
+"problème."
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Échec du parcours de l'arbre"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non verrouillé"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "Impossible d'ouvrir %s"
+msgid "Installing %s"
+msgstr "Installation de %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Délier %s [%s]\n"
+msgid "Configuring %s"
+msgstr "Configuration de %s"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Impossible de lire le lien %s"
+msgid "Removing %s"
+msgstr "Suppression de %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Impossible de délier %s"
+msgid "Completely removing %s"
+msgstr "Suppression complète de %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Impossible de lier %s à %s"
+msgid "Noting disappearance of %s"
+msgstr "Disparition de %s constatée"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Seuil de delink de %so atteint.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "L'archive ne possède pas de champ de paquet"
+msgid "Running post-installation trigger %s"
+msgstr "Exécution des actions différées (« trigger ») de %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "%s ne possède pas d'entrée « override »\n"
+msgid "Directory '%s' missing"
+msgstr "Répertoire %s inexistant"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " le responsable de %s est %s et non %s\n"
+msgid "Could not open file '%s'"
+msgstr "Impossible d'ouvrir le fichier « %s »"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ne possède pas d'entrée « source override »\n"
+msgid "Preparing %s"
+msgstr "Préparation de %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Échec de l'allocation de mémoire"
+msgid "Unpacking %s"
+msgstr "Décompression de %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, 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"
+msgid "Preparing to configure %s"
+msgstr "Préparation de la configuration de %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Impossible de lire le fichier d'« override » %s"
+msgid "Installed %s"
+msgstr "%s installé"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
+msgid "Preparing for removal of %s"
+msgstr "Préparation de la suppression de %s"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Entrée « override » %s mal formée %llu n° 2"
+msgid "Removed %s"
+msgstr "%s supprimé"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Entrée « override » %s mal formée %llu n° 3"
+msgid "Preparing to completely remove %s"
+msgstr "Préparation de la suppression complète de %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algorithme de compression « %s » inconnu"
+msgid "Completely removed %s"
+msgstr "%s complètement supprimé"
 
-#: 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"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Impossible d'écrire sur %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Impossible de créer FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Échec du fork"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Fils compressé"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "L'opération a été interrompue avant de se terminer"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Erreur interne, impossible de créer %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Échec d'entrée/sortie du sous-processus sur le fichier"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "problème de dépendances : laissé non configuré"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Impossible de lire lors du calcul de la somme MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Aucun rapport « apport » n'a été créé car le message d'erreur indique une "
+"erreur consécutive à un échec précédent."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problème en déliant %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+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é"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Aucun « apport » n'a été créé car une erreur de dépassement de capacité "
+"mémoire a été signalée"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Enregistrement de paquet inconnu !"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Aucun « apport » n'a été créé car une erreur d'entrée/sortie de dpkg a été "
+"signalée"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
 
 #~ 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 5bd960c32..e7aa78713 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,11 +10,11 @@ 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
-"Language: \n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,76 +101,76 @@ msgstr "Espazo total contabilizado: "
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro de paquete %s está sen sincronizar."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Debe fornecer cando menos un patrón de busca"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 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:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Ficheiros de paquetes:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Paquetes inmobilizados:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(non se atopou)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ningún)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Inmobilizado: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Táboa de versións:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -333,7 +333,7 @@ msgid "Couldn't find package %s"
 msgstr "Non foi posíbel atopar o paquete %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s cambiado a instalado manualmente.\n"
@@ -361,7 +361,7 @@ msgstr "Non é posíbel bloquear o directorio de descargas"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Non sé posíbel atopar un paquete fonte para %s"
@@ -393,7 +393,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado «%s»\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non foi posíbel determinar o espazo libre en %s"
@@ -426,7 +426,7 @@ msgstr "Obter fonte %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Non se puideron obter algúns arquivos."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de só descargas"
 
@@ -435,49 +435,49 @@ msgstr "Completouse a descarga no modo de só descargas"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetado «%s».\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a orde de construción de «%s».\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -486,7 +486,7 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -495,14 +495,14 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -511,7 +511,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:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -520,30 +520,30 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Non se puideron procesar as dependencias de construción"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Rexistro de cambios de %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Módulos admitidos:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -636,16 +636,20 @@ msgstr ""
 "para obter mais información e opcións\n"
 "                       Este APT ten poderes da Super Vaca.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -654,6 +658,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -683,8 +688,9 @@ msgstr "%s xa é a versión máis recente.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Agardouse por %s pero non estaba alí"
@@ -879,7 +885,7 @@ 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Fallou"
 
@@ -925,7 +931,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
 msgid "Unable to accept connection"
 msgstr "Non é posíbel aceptar a conexión"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Xurdiu un problema ao calcular o hash do ficheiro"
 
@@ -1059,95 +1065,185 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Os ficheiros baleiros non poden ser arquivadores válidos"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Produciuse un erro ao escribir no ficheiro"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Produciuse un erro ao ler do servidor"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Produciuse un erro ao escribir nun ficheiro"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Produciuse un erro ao escribir no ficheiro de saída"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Agardando polas cabeceiras"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Liña de cabeceira incorrecta"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou unha cabeceira de resposta incorrecta"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Formato de datos descoñecido"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Produciuse un fallo na conexión"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Produciuse un erro interno"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Teño "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Rcb:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Traballando]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Cambio de soporte: introduza o disco etiquetado\n"
+" «%s»\n"
+"na unidade «%s» e prema Intro\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Ignórase o aviso de autenticación.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Non foi posíbel autenticar algúns paquetes"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Instalar estes paquetes sen verificación?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Xurdiron problemas e empregouse -y sen --force-yes"
+
+#: apt-private/private-download.cc:91 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-install.cc:82
 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:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Produciuse un erro interno; non rematou a ordenación"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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."
@@ -1155,52 +1251,48 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Si, fai o que digo!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1211,19 +1303,19 @@ msgstr ""
 "Para continuar escriba a frase «%s»\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Interromper."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Quere continuar?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Non foi posíbel descargar algúns ficheiros"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1231,20 +1323,20 @@ msgstr ""
 "Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-"
 "missing."
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Interrompendo a instalación."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1258,17 +1350,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:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Isto será feito automaticamente por dpkg."
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1286,15 +1378,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Produciuse un erro interno, o Retirado automático estragou cousas"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1306,7 +1398,7 @@ msgstr[1] ""
 "Os seguintes paquetes foron instalados automaticamente e xa non son "
 "necesarios:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1315,7 +1407,7 @@ 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:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1334,7 +1426,7 @@ msgstr ""
 "Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou "
 "especifique unha solución)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1347,68 +1439,68 @@ msgstr ""
 "algúns paquetes solicitados aínda non se creasen ou que se movesen da "
 "entrada."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Paquetes estragados"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Instalaranse os seguintes paquetes extra:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Paquetes suxeridos:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Omítese %s, xa está instalado e non se especificou a anovación.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Omitindo %s, non está instalado e só se solicitaron as anovacións.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "A reinstalación de %s non é posíbel, non se pode descargar.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s» xa que «%s»\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "O paquete %s non está instalado, así que non foi retirado\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "O paquete %s non está instalado, así que non foi retirado\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1416,136 +1508,121 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "mais %s está instalado"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mais vaise instalar %s"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "mais non é instalábel"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "mais é un paquete virtual"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "mais non está instalado"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "mais non se vai a instalar"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " ou"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Os seguintes paquetes NOVOS hanse instalar:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Vanse RETIRAR os paquetes seguintes:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Consérvanse os seguintes paquetes:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Vanse anovar os paquetes seguintes:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Vanse REVERTER os seguintes paquetes :"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Vanse modificar os paquetes retidos seguintes:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por mor de %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1553,27 +1630,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu anovados, %lu instalados, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu revertidos, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non instalados ou retirados de todo.\n"
@@ -1582,7 +1659,7 @@ msgstr "%lu non instalados ou retirados de todo.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[S/n]"
 
@@ -1590,36 +1667,28 @@ msgstr "[S/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1633,40 +1702,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Ignórase o aviso de autenticación.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Non foi posíbel autenticar algúns paquetes"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Instalar estes paquetes sen verificación?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1677,74 +1712,44 @@ msgstr "Non foi posíbel cambiar o nome de %s a %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "A orde «update» non toma argumentos"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Feito"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Teño "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Rcb:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Traballando]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Cambio de soporte: introduza o disco etiquetado\n"
-" «%s»\n"
-"na unidade «%s» e prema Intro\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Non é posíbel ler %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1819,36 +1824,433 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Mesturando a información sobre paquetes dispoñíbeis"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Chamouse a DropNode nun nodo aínda ligado"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Non foi posíbel atopar o elemento hash"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Non é posíbel determinar o estado %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Non foi posíbel reservar un desvío"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Non é posíbel escribir en %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Produciuse un erro interno en AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "A lista de extensións de paquetes é longa de máis"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Produciuse un erro ao procesar o directorio %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "A lista de extensións de fontes é longa de máis"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Desvío %s -> %s engadido dúas veces"
+msgid "Error processing contents %s"
+msgstr "Produciuse un erro ao procesar o contido %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Non coincide ningunha selección"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Ficheiro de configuración %s/%s duplicado"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»"
+
+#: ftparchive/cachedb.cc:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "A base de datos é antiga, tentando anovar %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, 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:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Non foi posíbel determinar o estado %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Non foi posíbel ler a ligazón %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "O arquivo non ten un rexistro de control"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "O arquivo non tiña un campo Package"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s non ten unha entrada de «override»\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  O mantedor de %s é %s, non %s\n"
+
+#: ftparchive/writer.cc:706
+#, 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:710
+#, 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:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, 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:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1874,17 +2276,6 @@ msgstr "O paquete tenta escribir no destino do desvío %s/%s"
 msgid "The diversion path is too long"
 msgstr "A ruta do desvío é longa de máis"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1913,30 +2304,36 @@ msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
 msgid "Unable to stat %s"
 msgstr "Non é posíbel determinar o estado %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Chamouse a DropNode nun nodo aínda ligado"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Non foi posíbel pechar o ficheiro %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Non foi posíbel atopar o elemento hash"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Non foi posíbel reservar un desvío"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Produciuse un erro interno en AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Desvío %s -> %s engadido dúas veces"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ficheiro de control non analizábel"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ficheiro de configuración %s/%s duplicado"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1984,202 +2381,52 @@ msgstr "A suma de comprobación do arquivo tar non coincide, está danado"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Executando dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "O sistema de empaquetado «%s» non está admitido"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Escribíronse %i rexistros.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Ficheiro de control non analizábel"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Valor de hash non coincidente para: %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/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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Caché de paquetes baleira"
-
-#: 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: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:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "O ficheiro de caché de paquetes está danado"
+msgid "List directory %spartial is missing."
+msgstr "Non se atopa a lista de directorios %sparcial."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Depende"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "PreDepende"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Suxire"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Recomenda"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Conflitos"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Substitúe a"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Fai obsoleto a"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Estraga"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Mellora"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "importante"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "requirido"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "estándar"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opcional"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Archives directory %spartial is missing."
+msgstr "Non se atopa a lista de arquivos %sparcial."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Non foi posíbel atopar o controlador de métodos %s."
+msgid "Unable to lock directory %s"
+msgstr "Non é posíbel bloquear o directorio %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "O método %s non se iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "O tipo de ficheiros de índices «%s» non está admitido"
 
-#: 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/depcache.cc:250
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Non foi posíbel abrir o ficheiro de estado %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Obtendo o ficheiro %li de %li (restan %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
+msgid "Retrieving file %li of %li"
+msgstr "Obtendo o ficheiro %li de %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2199,7 +2446,7 @@ msgstr "Os tamaños non coinciden"
 msgid "Invalid file format"
 msgstr "Operación incorrecta: %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2208,29 +2455,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2241,12 +2488,12 @@ msgstr ""
 "%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Produciuse un erro de GPG: %s %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2255,12 +2502,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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2268,169 +2515,121 @@ msgstr ""
 "Os ficheiros de índices de paquetes están danados. Non hai un campo "
 "Filename: para o paquete %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "A caché ten un sistema de versionado incompatíbel"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Non foi posíbel atopar o controlador de métodos %s."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Produciuse un erro ao procesar %s (FindPkg)"
-
-#: 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: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."
+msgid "Is the package %s installed?"
+msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "O método %s non se iniciou correctamente"
 
-#: 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/acquire-worker.cc:455
+#, 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/pkgcachegen.cc:576
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de "
-"ficheiros"
+"O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu "
+"arquivo."
 
-#: 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/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/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/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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recollendo as provisións de ficheiros"
+#: 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/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/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"
 
-#: 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/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Non foi posíbel ler a lista de orixes."
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "O bloque de provedor %s non contén unha pegada dixital"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Non se atopou a publicación «%s» de «%s»"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "Non se atopa a lista de directorios %sparcial."
+msgid "Version '%s' for '%s' was not found"
+msgstr "Non se atopou a versión «%s» de «%s»"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Non se atopa a lista de arquivos %sparcial."
+msgid "Couldn't find task '%s'"
+msgstr "Non foi posíbel atopar a tarefa «%s»"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Non é posíbel bloquear o directorio %s"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%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 "Obtendo o ficheiro %li de %li (restan %s)"
+#: 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/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, c-format
-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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 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/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Non é posíbel analizar %s."
+"Non é posíbel seleccionar distintas versións do paquete «%s» xa que é "
+"puramente virtual"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, 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"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
-"Rexistro incorrecto no ficheiro de preferencias %s; falta a cabeceira Package"
+"Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
+"«%s» xa que non ten ningunha delas"
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Did not understand pin type %s"
-msgstr "Non se entendeu o tipo de inmobilización %s"
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
+"Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é "
+"puramente virtual"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 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:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Non foi posíbel abrir o ficheiro «%s»"
+"Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten "
+"candidata"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"Non é posíbel seleccionar a versión instalada do paquete %s xa que non está "
+"instalado"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2514,55 +2713,88 @@ msgstr "Escribindo a nova lista de orixes\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas da lista de orixes deste disco son:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Non é posíbel analizar %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo a árbore de dependencias"
 
-#: 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: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/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Non foi posíbel abrir o ficheiro de estado %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Escribíronse %i rexistros.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n"
+
+#: 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 ""
+"Escribíronse %i rexistros con %i ficheiros que faltan e %i ficheiros que non "
+"coinciden\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Valor de hash non coincidente para: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2589,6 +2821,220 @@ msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "O sistema de empaquetado «%s» non está admitido"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Executando dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Non foi posíbel abrir o ficheiro «%s»"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Caché de paquetes baleira"
+
+#: 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: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: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: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: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:321
+msgid "Depends"
+msgstr "Depende"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "PreDepende"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Suxire"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Recomenda"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Conflitos"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Substitúe a"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Fai obsoleto a"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Estraga"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Mellora"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "importante"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "requirido"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "estándar"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcional"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Recollendo as provisións de ficheiros"
+
+#: 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/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/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/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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2668,249 +3114,148 @@ msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
 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/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: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:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Non foi posíbel atopar a tarefa «%s»"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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: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»"
+msgid "Unable to parse package file %s (1)"
+msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-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:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é "
-"puramente virtual"
+"Algúns ficheiros de índice fallaron durante a descarga. Ignoráronse, ou "
+"foron utilizados algúns antigos no seu lugar"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "O bloque de provedor %s non contén unha pegada dixital"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Non é posíbel analizar o punto de montaxe %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "Instalando %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Non foi posíbel analizar o CD-ROM"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "Configurando %s"
+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/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Retirando %s"
+msgid "Command line option %s is not understood"
+msgstr "Non se entende a opción de liña de ordes %s"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "%s completamente retirado"
+msgid "Command line option %s is not boolean"
+msgstr "A opción de liña de ordes %s non é booleana"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Tomando nota da desaparición de %s"
+msgid "Option %s requires an argument."
+msgstr "A opción %s precisa dun argumento."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Executando o disparador de post-instalación %s"
+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>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Falta o directorio «%s»"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "A opción %s precisa dun argumento enteiro, non «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Non foi posíbel abrir o ficheiro «%s»"
+msgid "Option '%s' is too long"
+msgstr "A opción «%s» é longa de máis"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Preparando %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "O senso %s non se entende, probe «true» ou «false»."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Desempaquetando %s"
+msgid "Invalid operation %s"
+msgstr "Operación incorrecta: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Preparandose para configurar %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Abreviatura de tipo «%c» descoñecida"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "Instalouse %s"
+msgid "Opening configuration file %s"
+msgstr "Abrindo o ficheiro de configuración %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Preparándose para o retirado de %s"
+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/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "Retirouse %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Produciuse un erro de sintaxe %s:%u: Etiqueta mal formada"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Preparándose para retirar %s completamente"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra despois do valor"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Retirouse %s completamente"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemas de dependencias - déixase sen configurar"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-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:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-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:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
-"erro de disco cheo."
+"Produciuse un erro de sintaxe %s:%u: Só se poden facer directivas no nivel "
+"superior"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Non é posíbel bloquear o directorio de administración (%s). Esta usandoo "
-"algún outro proceso?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Produciuse un erro de sintaxe %s:%u: Incluído de aquí"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Non é posíbel bloquear o directorio de administración (%s). É o "
-"administrador?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Produciuse un erro de sintaxe %s:%u: Non se admite a directiva «%s»"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"dpkg interrompeuse, debe executar manualmente «%s» para corrixir o problema. "
+"Produciuse un erro de sintaxe %s:%u: a directiva «clear» require unha árbore "
+"de opción como argumento"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Non está bloqueado"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3028,54 +3373,11 @@ msgstr "Produciuse un problema ao desligar o ficheiro %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Non se atopou a selección %s"
+msgid "No keyring installed in %s."
+msgstr "Non ha ningún chaveiro instalado en %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3133,528 +3435,237 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Produciuse un erro de sintaxe %s:%u: Incluído de aquí"
+msgid "%c%s... Error!"
+msgstr "%c%s... Erro!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Produciuse un erro de sintaxe %s:%u: Non se admite a directiva «%s»"
+msgid "%c%s... Done"
+msgstr "%c%s... Feito"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Feito"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "A opción %s precisa dun argumento."
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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>."
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "A opción %s precisa dun argumento enteiro, non «%s»"
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "A opción «%s» é longa de máis"
+msgid "%lis"
+msgstr "%lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "O senso %s non se entende, probe «true» ou «false»."
+msgid "Selection %s not found"
+msgstr "Non se atopou a selección %s"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "A lista de extensións de paquetes é longa de máis"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Produciuse un erro ao procesar o directorio %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "A lista de extensións de fontes é longa de máis"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido"
+"Non é posíbel bloquear o directorio de administración (%s). Esta usandoo "
+"algún outro proceso?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Produciuse un erro ao procesar o contido %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-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 "Unable to lock the administration directory (%s), are you root?"
 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:841
-msgid "No selections matched"
-msgstr "Non coincide ningunha selección"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, 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"
+"Non é posíbel bloquear o directorio de administración (%s). É o "
+"administrador?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "A base de datos é antiga, tentando anovar %s"
-
-#: ftparchive/cachedb.cc:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:99
-#, 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:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Non foi posíbel ler a ligazón %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "O arquivo non ten un rexistro de control"
+"dpkg interrompeuse, debe executar manualmente «%s» para corrixir o problema. "
 
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Non é posíbel obter un cursor"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non está bloqueado"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: non é posíbel ler o directorio %s\n"
+msgid "Installing %s"
+msgstr "Instalando %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, 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 "
+msgid "Configuring %s"
+msgstr "Configurando %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, 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"
+msgid "Removing %s"
+msgstr "Retirando %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to open %s"
-msgstr "Non foi posíbel abrir %s"
+msgid "Completely removing %s"
+msgstr "%s completamente retirado"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DesLig %s [%s]\n"
+msgid "Noting disappearance of %s"
+msgstr "Tomando nota da desaparición de %s"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Non foi posíbel ler a ligazón %s"
+msgid "Running post-installation trigger %s"
+msgstr "Executando o disparador de post-instalación %s"
 
-#: ftparchive/writer.cc:290
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Non foi posíbel desligar %s"
+msgid "Directory '%s' missing"
+msgstr "Falta o directorio «%s»"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Non foi posíbel ligar %s con %s"
+msgid "Could not open file '%s'"
+msgstr "Non foi posíbel abrir o ficheiro «%s»"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Acadouse o límite de desligado de %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "O arquivo non tiña un campo Package"
+msgid "Preparing %s"
+msgstr "Preparando %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s non ten unha entrada de «override»\n"
+msgid "Unpacking %s"
+msgstr "Desempaquetando %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  O mantedor de %s é %s, non %s\n"
+msgid "Preparing to configure %s"
+msgstr "Preparandose para configurar %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s non ten unha entrada de «override» de código fonte\n"
+msgid "Installed %s"
+msgstr "Instalouse %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Non foi posíbel reservar memoria"
+msgid "Preparing for removal of %s"
+msgstr "Preparándose para o retirado de %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, 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)"
+msgid "Removed %s"
+msgstr "Retirouse %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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)"
+msgid "Preparing to completely remove %s"
+msgstr "Preparándose para retirar %s completamente"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "«Override» %s liña %lu incorrecta (2)"
+#: apt-pkg/deb/dpkgpm.cc:1013
+#, c-format
+msgid "Completely removed %s"
+msgstr "Retirouse %s completamente"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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"
+msgid "Can not write log (%s)"
+msgstr "Non é posíbel escribir en %s"
 
-#: 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"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Non foi posíbel crear o FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Non foi posíbel facer a bifurcación"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Fillo de compresión"
+#: apt-pkg/deb/dpkgpm.cc:1687
+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"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Produciuse un erro interno, non foi posíbel crear %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemas de dependencias - déixase sen configurar"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Produciuse un fallo na E/S do subproceso/ficheiro"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que "
+"é un error provinte dun fallo anterior."
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Non foi posíbel ler ao calcular o MD5"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
+"erro de disco cheo."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Xurdiu un problema ao desligar %s"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Non se escribiu un informe de contribución porque a mensaxe de erro indica "
+"un erro de falta de memoria"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 #, 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 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!"
+"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
+"erro de disco cheo."
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
+"erro de E/S en dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Produciuse un erro interno, AllUpgrade estragou cousas"
 
 #~ 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 b70ae3b34..adc738bec 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.25\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2010-01-01 19:13+0100\n"
 "PO-Revision-Date: 2004-06-10 19:58+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
+"Language: he\n"
 "Language-Team: Hebrew\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/hu.po b/po/hu.po
index 9823108af..9457b384c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt trunk\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
+"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"Language-Team: Hungarian <gnome-hu-list@gnome.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -100,75 +100,75 @@ msgstr "Nyilvántartott terület összesen: "
 msgid "Package file %s is out of sync."
 msgstr "%s csomagfájl nincs szinkronban."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Legalább egy keresési mintát meg kell adnia"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 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:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Csomagfájlok:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Rögzített csomagok:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(nem található)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Telepítve: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Jelölt: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(nincs)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Csomagrögzítés: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Verziótáblázat:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -327,7 +327,7 @@ msgid "Couldn't find package %s"
 msgstr "Az alábbi csomag nem található: %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s kézi telepítésűre állítva.\n"
@@ -358,7 +358,7 @@ 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nem található forráscsomag ehhez: %s"
@@ -390,7 +390,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "A már letöltött „%s� fájl kihagyása\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nem határozható meg a szabad hely mennyisége itt: %s"
@@ -423,7 +423,7 @@ msgstr "Forrás letöltése: %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Nem sikerült néhány archívumot letölteni."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "A letöltés befejeződött a „csak letöltés� módban"
 
@@ -432,32 +432,32 @@ msgstr "A letöltés befejeződött a „csak letöltés� módban"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "„%s� kibontási parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "„%s� elkészítési parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnál"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -466,17 +466,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:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, 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:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +485,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:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -494,14 +494,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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,7 +510,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,30 +519,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Nem sikerült az építési függőségeket feldolgozni"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Változási napló ehhez: %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -631,17 +631,21 @@ msgstr ""
 "információkért és opciókért.\n"
 "                       Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -650,6 +654,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -679,8 +684,9 @@ msgstr "%s már be van állítva visszafogásra.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s eddig sem volt visszafogva.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, 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"
@@ -899,7 +905,7 @@ 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Sikertelen"
 
@@ -945,7 +951,7 @@ msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot"
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 
@@ -1076,142 +1082,228 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Az üres fájlok biztosan nem érvényes csomagok"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "A kiválasztás sikertelen"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Várakozás a fejlécekre"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Rossz fejlécsor"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 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:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "A HTTP-kiszolgáló tartománytámogatása sérült"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Ismeretlen dátumformátum"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Rossz fejlécadatok"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Belső hiba"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Találat "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Letöltés:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Mellőz "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Hiba "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Folyamatban]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Helyezze be a(z)\n"
+" „%s�\n"
+"címkéjű lemezt a(z) %s meghajtóba, és nyomja meg az Entert\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "A hitelesítési figyelmeztetés felülbírálva.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Néhány csomag nem hitelesíthető"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 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:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Belső hiba, a rendezés nem fejeződött be"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Igen, tedd amit mondok!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1222,19 +1314,19 @@ msgstr ""
 "A folytatáshoz írja be ezt a mondatot: „%s�\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Megszakítva."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Folytatni akarja?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Néhány fájlt nem sikerült letölteni"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1242,19 +1334,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:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Nem lehet javítani a hiányzó csomagokat."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Telepítés megszakítása."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1268,15 +1360,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1294,15 +1386,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Belső hiba, az AutoRemover sérült"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1314,7 +1406,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:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1323,7 +1415,7 @@ 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:518
+#: apt-private/private-install.cc:519
 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."
@@ -1342,7 +1434,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:628
+#: apt-private/private-install.cc:638
 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"
@@ -1354,69 +1446,69 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Törött csomagok"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Javasolt csomagok:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Ajánlott csomagok:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s kihagyása, ez már telepítve van, és a frissítés nincs beállítva.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "„%s� kihagyása, nincs telepítve, és csak frissítések lettek kérve.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s már a legújabb verzió.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "„%s� (%s) verzió lett kijelölve ehhez: „%s�\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "„%s� (%s) verzió lett kijelölve ehhez: „%s�, a(z) „%s� miatt\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "A(z) „%s� csomag nincs telepítve, így nem lett törölve. Erre gondolt: „%s�?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "A(z) „%s� csomag nincs telepítve, így nem lett törölve\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1424,136 +1516,120 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Telepítve]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Telepítve]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Telepítve]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Telepítve]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "de %s van telepítve"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "de csak %s telepíthető"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "de az nem telepíthető"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "de az egy virtuális csomag"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "de az nincs telepítve"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "de az nincs telepítésre megjelölve"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " vagy"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Az alábbi csomagok el lesznek T�VOL�TVA:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Az alábbi csomagok vissza lesznek tartva:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Az alábbi csomagok frissítve lesznek:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Az alábbi visszafogott csomagokat cserélem:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s miatt) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1561,27 +1637,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu frissített, %lu újonnan telepített, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu újratelepítendő, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu visszafejlesztendő, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
@@ -1590,7 +1666,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[I/n]"
 
@@ -1598,36 +1674,28 @@ msgstr "[I/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "I"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1641,39 +1709,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "A hitelesítési figyelmeztetés felülbírálva.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Néhány csomag nem hitelesíthető"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1684,74 +1719,44 @@ msgstr "„%s� átnevezése sikertelen erre: %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Az update parancsnak nincsenek argumentumai"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Kész"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Találat "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Letöltés:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Mellőz "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Hiba "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Folyamatban]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Helyezze be a(z)\n"
-" „%s�\n"
-"címkéjű lemezt a(z) %s meghajtóba, és nyomja meg az Entert\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s nem olvasható"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1825,36 +1830,431 @@ 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"
 
-#: 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"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "A hash elem nem található!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s nem érhető el"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Nem lehet eltérítést lefoglalni"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nem lehet írni ebbe: %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Belső hiba az AddDiversion hívásban"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "A csomagkiterjesztések listája túl hosszú"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Hiba a(z) %s könyvtár feldolgozásakor"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "A forráskiterjesztések listája túl hosszú"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Hiba a tartalomfájl fejlécének írásakor"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, 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"
+msgid "Error processing contents %s"
+msgstr "Hiba %s tartalmának feldolgozásakor"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Nincs illeszkedő kiválasztás"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Dupla %s/%s konfigurációs fájl"
+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:65
+#, 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:83
+#, 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:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s elérése sikertelen"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "readlink nem hajtható végre erre: %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Az archívumnak nincs vezérlő rekordja"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Az archívumnak nem volt csomag mezője"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s karbantartója %s, nem %s\n"
+
+#: ftparchive/writer.cc:706
+#, 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:710
+#, 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:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "„%s� átnevezése sikertelen erre: %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1880,17 +2280,6 @@ msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba"
 msgid "The diversion path is too long"
 msgstr "Az eltérített útvonal túl hosszú"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1919,30 +2308,36 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
 msgid "Unable to stat %s"
 msgstr "%s nem érhető el"
 
-#: 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/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/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "A(z) %s fájl bezárása sikertelen"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "A hash elem nem található!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Nem lehet eltérítést lefoglalni"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Belső hiba az AddDiversion hívásban"
+
+#: apt-inst/filelist.cc:477
 #, 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"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Belső hiba, %s tag nem található"
+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/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Értelmezhetetlen control fájl"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Dupla %s/%s konfigurációs fájl"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1990,201 +2385,52 @@ msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "A dpkg futtatása"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "A(z) „%s� csomagrendszer nem támogatott"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i rekord kiírva.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i rekord kiírva %i eltérő fájllal\n"
+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-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Belső hiba, %s tag nem található"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "%s hitelesítési rekordja nem található"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Értelmezhetetlen control fájl"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "%s ellenőrzőösszege nem megfelelő"
-
-#: apt-pkg/cachefile.cc:94
-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: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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Üres csomaggyorsítótár"
-
-#: 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: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: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"
+msgid "List directory %spartial is missing."
+msgstr "A(z) %spartial listakönyvtár hiányzik."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Függ ettől"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Függ ettől (előfüggés)"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Javasolja"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Ajánlja"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Ütközik"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Kicseréli"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Elavulttá teszi"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Töri"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Bővíti"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "fontos"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "szükséges"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "szabványos"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opcionális"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Archives directory %spartial is missing."
+msgstr "A(z) %spartial archívumkönyvtár hiányzik."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "A(z) %s metódusvezérlő nem található."
+msgid "Unable to lock directory %s"
+msgstr "%s könyvtár zárolása sikertelen"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, 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:169
-#, 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:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "A(z) „%s� indexfájltípus nem támogatott"
 
-#: 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/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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s állapotfájl megnyitása sikertelen"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li/%li fájl letöltése (%s marad)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s átmeneti állapotfájl írása sikertelen"
+msgid "Retrieving file %li of %li"
+msgstr "%li/%li fájl letöltése"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2204,7 +2450,7 @@ msgstr "A méret nem megfelelő"
 msgid "Invalid file format"
 msgstr "%s érvénytelen művelet"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2213,16 +2459,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2231,12 +2477,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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2246,12 +2492,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:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG hiba: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2260,180 +2506,129 @@ 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, 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/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: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
+#: apt-pkg/acquire-worker.cc:116
 #, 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: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: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."
+msgid "The method driver %s could not be found."
+msgstr "A(z) %s metódusvezérlő nem található."
 
-#: 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/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/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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "A(z) %s metódus nem indult el megfelelően"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása "
-"közben"
+"Helyezze be a(z) „%s� címkéjű lemezt a(z) „%s� meghajtóba, és nyomja meg az "
+"Entert."
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, 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: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"
+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."
 
-# FIXME
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "„Biztosítja� kapcsolatok összegyűjtése"
+#: 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nem lehet írni ebbe: %s"
+#: 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/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/cachefile.cc:94
+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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot"
+#: 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"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "A(z) %spartial listakönyvtár hiányzik."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "A források listája olvashatatlan."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "A(z) %spartial archívumkönyvtár hiányzik."
+msgid "Release '%s' for '%s' was not found"
+msgstr "„%s� kiadás nem található ehhez: „%s�"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "%s könyvtár zárolása sikertelen"
+msgid "Version '%s' for '%s' was not found"
+msgstr "„%s� verzió nem található ehhez: „%s�"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "%li/%li fájl letöltése (%s marad)"
+msgid "Couldn't find task '%s'"
+msgstr "„%s� feladat nem található"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nem található csomag a(z) „%s� reguláris kifejezéssel"
 
-#: 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/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/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "%s nem érhető el."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez"
+"„%s� csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
+"mert egyikkel sem rendelkezik"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 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)"
+"„%s� csomag legújabb verziója nem választható ki, mert teljesen virtuális"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "A(z) „%s� beállítása sikertelen"
+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/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"„%s� csomag telepített verziója nem választható ki, mert nincs telepítve"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2517,54 +2712,86 @@ msgstr "Új forráslista írása\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "%s nem érhető el."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Függőségi fa építése"
 
-#: 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: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/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "%s állapotfájl megnyitása sikertelen"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s átmeneti állapotfájl írása sikertelen"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "A helyzet elküldése a solvernek"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Kérés küldése a solvernek"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Felkészülés megoldás fogadására"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 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:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Külső solver végrehajtása"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
+msgid "Wrote %i records.\n"
+msgstr "%i rekord kiírva.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i rekord kiírva %i eltérő fájllal\n"
+
+#: 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 "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "%s hitelesítési rekordja nem található"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "%s ellenőrzőösszege nem megfelelő"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2591,6 +2818,219 @@ msgstr "Érvénytelen „Valid-Until� bejegyzés a(z) %s Release fájlban"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Érvénytelen „Date� bejegyzés a(z) %s Release fájlban"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "A(z) „%s� csomagrendszer nem támogatott"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "A dpkg futtatása"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "A(z) „%s� beállítása sikertelen"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Üres csomaggyorsítótár"
+
+#: 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: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: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: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: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:321
+msgid "Depends"
+msgstr "Függ ettől"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Függ ettől (előfüggés)"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Javasolja"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Ajánlja"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Ütközik"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Kicseréli"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Elavulttá teszi"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Töri"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Bővíti"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "fontos"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "szükséges"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "szabványos"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcionális"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "„Biztosítja� kapcsolatok összegyűjtése"
+
+#: 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/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/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/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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2676,240 +3116,145 @@ msgstr "„%1$s� típus nem ismert a(z) %3$s forráslista %2$u. sorában"
 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/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:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "„%s� verzió nem található ehhez: „%s�"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "„%s� feladat nem található"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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: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"
+msgid "Unable to parse package file %s (1)"
+msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"„%s� csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
-"mert egyikkel sem rendelkezik"
+"Néhány indexfájlt nem sikerült letölteni. Figyelmen kívül lettek hagyva, "
+"vagy régebbiek lettek felhasználva."
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "%s csatolási pont nem érhető el"
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Nem sikerült elérni a CD-ROM-ot."
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "%s telepítése"
+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/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "%s konfigurálása"
+msgid "Command line option %s is not understood"
+msgstr "%s parancssori kapcsoló értelmezhetetlen"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "%s eltávolítása"
+msgid "Command line option %s is not boolean"
+msgstr "%s parancssori kapcsoló nem logikai"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "%s teljes eltávolítása"
+msgid "Option %s requires an argument."
+msgstr "%s kapcsolóhoz argumentum szükséges."
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "„%s� eltűnése feljegyezve"
+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/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "A(z) %s telepítés utáni trigger futtatása"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "%s kapcsoló egész, és nem „%s� típusú argumentumot követel meg"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "A(z) „%s� könyvtár hiányzik"
+msgid "Option '%s' is too long"
+msgstr "Túl hosszú „%s� kapcsoló"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "A(z) „%s� fájl megnyitása sikertelen"
+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/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "%s előkészítése"
+msgid "Invalid operation %s"
+msgstr "%s érvénytelen művelet"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "%s kicsomagolása"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Ismeretlen típusrövidítés: „%c�"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "%s konfigurálásának előkészítése"
+msgid "Opening configuration file %s"
+msgstr "%s konfigurációs fájl megnyitása"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "%s telepítve"
+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/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s eltávolításának előkészítése"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Szintaktikai hiba %s: %u: rosszul formázott címke"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "%s eltávolítva"
+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/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s teljes eltávolításának előkészítése"
+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/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s teljesen eltávolítva"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "függőségi hibák - a csomag beállítatlan maradt"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
-"lemez"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-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:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-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:1685
-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"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Az adminisztrációs könyvtár (%s) nem zárolható, lehet hogy másik folyamat "
-"használja?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Az adminisztrációs könyvtár (%s) nem zárolható, rendszergazdaként próbálja?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Szintaktikai hiba %s:%u: „%s� nem támogatott előírás"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"A dpkg megszakadt, saját kezűleg kell futtatnia a(z) „%s� parancsot a "
-"probléma megoldásához. "
+"Szintaktikai hiba %s:%u: a törlési parancs egy beállítási fát vár "
+"argumentumként"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Nincs zárolva"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3029,54 +3374,11 @@ msgstr "Hiba a(z) %s fájl törlésekor"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "%s kiválasztás nem található"
+msgid "No keyring installed in %s."
+msgstr "Nincs kulcstartó telepítve ide: %s."
 
 # FIXME
 #: apt-pkg/contrib/mmap.cc:79
@@ -3134,524 +3436,233 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva"
+msgid "%c%s... Error!"
+msgstr "%c%s... Hiba!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Szintaktikai hiba %s:%u: „%s� nem támogatott előírás"
+msgid "%c%s... Done"
+msgstr "%c%s... Kész"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Kész"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "%s kapcsolóhoz argumentum szükséges."
+msgid "%lid %lih %limin %lis"
+msgstr "%lin %lió %lip %limp"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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."
+msgid "%lih %limin %lis"
+msgstr "%lió %lip %limp"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, 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"
+msgid "%limin %lis"
+msgstr "%lip %limp"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Túl hosszú „%s� kapcsoló"
+msgid "%lis"
+msgstr "%limp"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, 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."
+msgid "Selection %s not found"
+msgstr "%s kiválasztás nem található"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "A csomagkiterjesztések listája túl hosszú"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Hiba a(z) %s könyvtár feldolgozásakor"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "A forráskiterjesztések listája túl hosszú"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Hiba a tartalomfájl fejlécének írásakor"
+"Az adminisztrációs könyvtár (%s) nem zárolható, lehet hogy másik folyamat "
+"használja?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Hiba %s tartalmának feldolgozásakor"
-
-#: ftparchive/apt-ftparchive.cc:626
-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 "Unable to lock the administration directory (%s), are you root?"
 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:841
-msgid "No selections matched"
-msgstr "Nincs illeszkedő kiválasztás"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "A DB megsérült, a fájl átnevezve %s.old-ra"
+"Az adminisztrációs könyvtár (%s) nem zárolható, rendszergazdaként próbálja?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, 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:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink nem hajtható végre erre: %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Az archívumnak nincs vezérlő rekordja"
-
-#: ftparchive/cachedb.cc:594
-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"
+"A dpkg megszakadt, saját kezűleg kell futtatnia a(z) „%s� parancsot a "
+"probléma megoldásához. "
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Fabejárás nem sikerült"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Nincs zárolva"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s megnyitása sikertelen"
+msgid "Installing %s"
+msgstr "%s telepítése"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Configuring %s"
+msgstr "%s konfigurálása"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink nem hajtható végre erre: %s"
+msgid "Removing %s"
+msgstr "%s eltávolítása"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "%s törlése sikertelen"
+msgid "Completely removing %s"
+msgstr "%s teljes eltávolítása"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s linkelése sikertelen ehhez: %s"
+msgid "Noting disappearance of %s"
+msgstr "„%s� eltűnése feljegyezve"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " a DeLink korlátja (%sB) elérve.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Az archívumnak nem volt csomag mezője"
+msgid "Running post-installation trigger %s"
+msgstr "A(z) %s telepítés utáni trigger futtatása"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
+msgid "Directory '%s' missing"
+msgstr "A(z) „%s� könyvtár hiányzik"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s karbantartója %s, nem %s\n"
+msgid "Could not open file '%s'"
+msgstr "A(z) „%s� fájl megnyitása sikertelen"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
+msgid "Preparing %s"
+msgstr "%s előkészítése"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nem sikerült memóriát lefoglalni"
+msgid "Unpacking %s"
+msgstr "%s kicsomagolása"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, 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"
+msgid "Preparing to configure %s"
+msgstr "%s konfigurálásának előkészítése"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni"
+msgid "Installed %s"
+msgstr "%s telepítve"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
+msgid "Preparing for removal of %s"
+msgstr "%s eltávolításának előkészítése"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #2"
+msgid "Removed %s"
+msgstr "%s eltávolítva"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #3"
+msgid "Preparing to completely remove %s"
+msgstr "%s teljes eltávolításának előkészítése"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "„%s� tömörítési algoritmus ismeretlen"
+msgid "Completely removed %s"
+msgstr "%s teljesen eltávolítva"
 
-#: 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"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nem lehet írni ebbe: %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Nem sikerült FILE*-ot létrehozni"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Nem sikerült forkolni"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Gyermekfolyamat tömörítése"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Belső hiba, %s létrehozása sikertelen"
+#: apt-pkg/deb/dpkgpm.cc:1687
+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"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO az alfolyamathoz/fájlhoz nem sikerült"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "függőségi hibák - a csomag beállítatlan maradt"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Olvasási hiba az MD5 kiszámításakor"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+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."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Hiba %s törlésekor"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
+"lemez"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási "
+"hibát jelez"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Ismeretlen csomagbejegyzés!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren "
+"lévő hibát jelez"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Nem került kiírásra apport jelentés, mert a hibaüzenet dpkg I/O hibát jelez"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Belső hiba, az AllUpgrade megsértett valamit"
 
 #~ 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 d1eebbf79..5348110c2 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2014-05-31 17:04+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -99,76 +99,76 @@ msgstr "Totale spazio occupato: "
 msgid "Package file %s is out of sync."
 msgstr "Il file dei pacchetti %s non è sincronizzato."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "È necessario specificare almeno un modello per la ricerca"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "File dei pacchetti:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Pacchetti con gancio:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(non trovato)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Installato: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Gancio del pacchetto: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Tabella versione:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -335,7 +335,7 @@ msgid "Couldn't find package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "È stato impostato %s per l'installazione manuale.\n"
@@ -366,7 +366,7 @@ 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossibile trovare un pacchetto sorgente per %s"
@@ -399,7 +399,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossibile determinare lo spazio libero in %s"
@@ -432,7 +432,7 @@ msgstr "Recupero sorgente %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Recupero di alcuni archivi non riuscito."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Scaricamento completato e in modalità solo scaricamento"
 
@@ -441,32 +441,32 @@ msgstr "Scaricamento completato e in modalità solo scaricamento"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando di estrazione \"%s\" non riuscito.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando \"%s\" di generazione non riuscito.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Creazione processo figlio non riuscita"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -475,17 +475,17 @@ msgstr ""
 "Informazioni sull'architettura non disponibili per %s. Consultare apt."
 "conf(5) APT::Architectures per l'impostazione"
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ha dipendenze di generazione.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -494,7 +494,7 @@ msgstr ""
 "La dipendenza %s per %s non può essere soddisfatta perché %s non è "
 "consentito su pacchetti \"%s\""
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -503,14 +503,14 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
 "non può essere trovato"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -519,7 +519,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -528,30 +528,30 @@ msgstr ""
 "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s "
 "non ha una versione candidata"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog per %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -641,15 +641,20 @@ msgstr ""
 "apt-get(8), sources.list(5) e apt.conf(5).\n"
 "                       Questo APT ha i poteri della Super Mucca.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 msgid "Must specify at least one pair url/filename"
 msgstr "È necessario specificare almeno una coppia URL/nome file"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr "Scaricamento non riuscito"
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
+#, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -658,6 +663,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -696,8 +702,9 @@ msgstr "%s è già stato impostato come bloccato.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s era già non bloccato.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "In attesa di %s ma non era presente"
@@ -938,7 +945,7 @@ msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Impossibile connettersi al socket dati, tempo esaurito per la connessione"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Non riuscito"
 
@@ -984,7 +991,7 @@ msgstr "Connessione al socket dati terminata"
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Si è verificato un problema nel creare l'hash del file"
 
@@ -1121,136 +1128,223 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "File vuoti non possono essere archivi validi"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Errore nello scrivere sul file"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Errore nel leggere dal server"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Errore nello scrivere su file"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Select non riuscita"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Connessione terminata"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "In attesa degli header"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Riga header non corretta"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Il server HTTP ha inviato un header di risposta non valido"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Questo server HTTP ha un supporto del range non corretto"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Header dati non corretto"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Trovato "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Scaricamento di:"
+
+# (ndt) questa non so cosa voglia dire
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [In lavorazione]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Cambio disco: inserire il disco chiamato\n"
+" \"%s\"\n"
+"nell'unità \"%s\" e premere Invio\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr "Ordinamento"
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Avviso di autenticazione disabilitato.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Alcuni pacchetti non possono essere autenticati"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Installare questi pacchetti senza verificarli?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Impossibile recuperare %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Errore interno, InstallPackages è stato chiamato con un pacchetto "
 "danneggiato."
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Errore interno, l'ordinamento non è stato terminato"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Spazio libero in %s insufficiente."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "È stata specificata la modalità \"Trivial Only\", ma questa non è "
@@ -1258,11 +1352,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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Sì, esegui come da richiesta."
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1273,19 +1367,19 @@ msgstr ""
 "Per continuare scrivere la frase \"%s\"\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Interrotto."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Continuare?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Scaricamento di alcuni file non riuscito"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1293,19 +1387,19 @@ msgstr ""
 "Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-"
 "get update\" o provare l'opzione \"--fix-missing\"."
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing su supporti estraibili non è ancora supportato"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Impossibile correggere i pacchetti mancanti."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Interruzione dell'installazione."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1319,16 +1413,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1346,15 +1440,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1367,7 +1461,7 @@ msgstr[1] ""
 "I seguenti pacchetti sono stati installati automaticamente e non sono più "
 "richiesti:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1378,7 +1472,7 @@ msgstr[1] ""
 "%lu pacchetti sono stati installati automaticamente e non sono più "
 "richiesti.\n"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 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."
@@ -1397,7 +1491,7 @@ msgstr ""
 "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
 "(o specificare una soluzione)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1409,73 +1503,73 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Pacchetti danneggiati"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "I seguenti pacchetti saranno inoltre installati:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Pacchetti suggeriti:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Pacchetti raccomandati:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Viene saltato %s poiché non è installato e sono richiesti solo gli "
 "aggiornamenti.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s è già alla versione più recente.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versione \"%s\" (%s) selezionata per \"%s\"\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versione \"%s\" (%s) selezionata per \"%s\" per via di \"%s\"\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso: si "
 "intendeva \"%s\"?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr "Elencazione"
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1483,133 +1577,117 @@ msgid_plural ""
 msgstr[0] "C'è %i versione aggiuntiva: usare \"-a\" per visualizzarla"
 msgstr[1] "Ci sono %i versioni aggiuntive: usare \"-a\" per visualizzarle"
 
-#: 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr "[installato, aggiornabile a: %s]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 msgid "[installed,local]"
 msgstr "[installato, locale]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr "[installato, auto-rimovibile]"
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 msgid "[installed,automatic]"
 msgstr "[installato, automatico]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 msgid "[installed]"
 msgstr "[installato]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr "[aggiornabile da: %s]"
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr "[configurazione residua]"
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "ma la versione %s è installata"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ma la versione %s sta per essere installata"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ma non è installabile"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "ma è un pacchetto virtuale"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "ma non è installato"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "ma non sta per essere installato"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " oppure"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "I seguenti pacchetti NUOVI saranno installati:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "I seguenti pacchetti saranno RIMOSSI:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "I seguenti pacchetti saranno aggiornati:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "I seguenti pacchetti saranno RETROCESSI:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "I seguenti pacchetti bloccati saranno cambiati:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (a causa di %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1618,27 +1696,27 @@ msgstr ""
 "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
 "si sta facendo."
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aggiornati, %lu installati, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstallati, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu retrocessi, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non completamente installati o rimossi.\n"
@@ -1647,7 +1725,7 @@ msgstr "%lu non completamente installati o rimossi.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[S/n]"
 
@@ -1655,36 +1733,28 @@ msgstr "[S/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "Ricerca sul testo"
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1698,39 +1768,6 @@ msgstr[1] "Ci sono %i record aggiuntivi: usare \"-a\" per visualizzarli"
 msgid "not a real package (virtual)"
 msgstr "non un vero pacchetto (virtuale)"
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avviso di autenticazione disabilitato.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Alcuni pacchetti non possono essere autenticati"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Installare questi pacchetti senza verificarli?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Impossibile recuperare %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1742,74 +1779,44 @@ msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 "Il proprio file \"%s\" è stato modificato: eseguire \"apt-get update\"."
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
-msgstr "Ricerca sul testo"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Il comando update non accetta argomenti"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
 
 #: apt-private/private-upgrade.cc:25
 msgid "Calculating upgrade... "
 msgstr "Calcolo dell'aggiornamento... "
 
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Errore interno, Upgrade ha rovinato qualche cosa"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Eseguito"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Trovato "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Scaricamento di:"
-
-# (ndt) questa non so cosa voglia dire
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [In lavorazione]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Cambio disco: inserire il disco chiamato\n"
-" \"%s\"\n"
-"nell'unità \"%s\" e premere Invio\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossibile leggere %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1888,36 +1895,430 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Unione delle informazioni disponibili"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode invocata su un nodo ancora collegato"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Localizzazione dell'elemento hash non riuscita."
+#: cmdline/apt-extracttemplates.cc:254
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Impossibile eseguire mkstemp %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Allocazione della deviazione non riuscita"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Impossibile scrivere in %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Errore interno in AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Impossibile trovare la versione di debconf. È installato?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "L'elenco dell'estensione del pacchetto è troppo lungo"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s"
+msgid "Error processing directory %s"
+msgstr "Errore nell'elaborare la directory %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Doppia aggiunta di deviazione %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Errore nell'elaborare i contenuti %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Nessuna selezione corrisponde"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "File di configurazione duplicato %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
+
+#: ftparchive/cachedb.cc:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Il database è vecchio, tentativo di aggiornamento %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Impossibile aprire il file del database %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Impossibile eseguire stat su %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Esecuzione di readlink su %s non riuscita"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "L'archivio non ha un campo \"control\""
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "L'archivio non ha un campo \"package\""
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s non ha un campo override\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  il responsabile di %s è %s non %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s non ha un campo source override\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s non ha neppure un campo binario override\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Override %s riga %llu malformato (%s)"
+
+#: 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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Rinomina di %s in %s non riuscita"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1944,17 +2345,6 @@ msgstr ""
 msgid "The diversion path is too long"
 msgstr "Il percorso della deviazione è troppo lungo"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1983,30 +2373,36 @@ msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
 msgid "Unable to stat %s"
 msgstr "Impossibile eseguire stat su %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode invocata su un nodo ancora collegato"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Chiusura del file %s non riuscita"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Localizzazione dell'elemento hash non riuscita."
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Allocazione della deviazione non riuscita"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Errore interno in AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Errore interno, impossibile trovare il membro %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Doppia aggiunta di deviazione %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "File \"control\" non analizzabile"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "File di configurazione duplicato %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -2054,201 +2450,53 @@ msgstr "Checksum di tar non riuscito, archivio danneggiato"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr "Avanzamento: [%3i%%]"
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Esecuzione di dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Il sistema di pacchetti \"%s\" non è supportato"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Scritti %i record.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Scritti %i record con %i file mancanti.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Scritti %i record con %i file senza corrispondenze\n"
-
-#: 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 ""
-"Scritti %i record con %i file mancanti e %i file senza corrispondenze\n"
-
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Impossibile trovare il record di autenticazione per %s"
-
-#: apt-pkg/indexcopy.cc:521
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash non corrispondente per %s"
-
-#: apt-pkg/cachefile.cc:94
-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:98
-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:116
-msgid "The list of sources could not be read."
-msgstr "Impossibile leggere l'elenco dei sorgenti."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Cache dei pacchetti vuota"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Il file della cache dei pacchetti è danneggiato"
-
-#: 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:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Il file cache del pacchetto è danneggiato, è troppo piccolo"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-inst/deb/debfile.cc:132
 #, 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: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:321
-msgid "Depends"
-msgstr "Dipende"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Pre-dipende"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Consiglia"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Raccomanda"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Va in conflitto"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Sostituisce"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Rende obsoleto"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Rompe"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Migliora"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "importante"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "richiesto"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standard"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opzionale"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Internal error, could not locate member %s"
+msgstr "Errore interno, impossibile trovare il membro %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Impossibile trovare un driver per il metodo %s."
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "File \"control\" non analizzabile"
 
-#: apt-pkg/acquire-worker.cc:118
+# (ndt) sarebbe da controllare meglio assieme a quella dopo
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "Il pacchetto %s è installato?"
+msgid "List directory %spartial is missing."
+msgstr "Manca la directory di liste %spartial."
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "Il metodo %s non si è avviato correttamente"
+msgid "Archives directory %spartial is missing."
+msgstr "Manca la directory di archivio %spartial."
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire.cc:99
 #, 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."
+msgid "Unable to lock directory %s"
+msgstr "Impossibile bloccare la directory %s"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "Il file indice di tipo \"%s\" non è supportato"
 
-#: 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/depcache.cc:250
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Apertura del file di stato %s non riuscita"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Scaricamento file %li di %li (%s rimanente)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Scrittura del file temporaneo di stato %s non riuscita"
+msgid "Retrieving file %li of %li"
+msgstr "Scaricamento file %li di %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2267,7 +2515,7 @@ msgstr "Le dimensioni non corrispondono"
 msgid "Invalid file format"
 msgstr "Formato file non valido"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2276,17 +2524,17 @@ msgstr ""
 "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
 "errata o file danneggiato)"
 
-#: apt-pkg/acquire-item.cc:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2295,12 +2543,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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2310,12 +2558,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:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Errore GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2324,14 +2572,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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2339,176 +2587,124 @@ msgstr ""
 "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
 "per il pacchetto %s."
 
-#: 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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Si è verificato un errore nell'elaborare %s (%s%d)"
-
-#: 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."
+msgid "The method driver %s could not be found."
+msgstr "Impossibile trovare un driver per il metodo %s."
 
-#: 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/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Il pacchetto %s è installato?"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Il metodo %s non si è avviato correttamente"
 
-#: 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."
+#: apt-pkg/acquire-worker.cc:455
+#, 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."
 
-# (ndt) il primo è il nome del pacchetto, il secondo la versione
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle "
-"dipendenze"
+"Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un "
+"archivio."
 
-#: 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/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/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"
+#: 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."
 
-# (ndt) non mi convince per niente, ma vediamo cosa salta fuori
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Il file fornisce"
+#: apt-pkg/cachefile.cc:94
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Impossibile scrivere in %s"
+#: apt-pkg/cachefile.cc:98
+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/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/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Impossibile leggere l'elenco dei sorgenti."
 
-#: apt-pkg/vendorlist.cc:85
+# (ndt) dovrebbe essere inteso il file Release
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Il blocco vendor %s non contiene impronte"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release \"%s\" per \"%s\" non trovato."
 
-# (ndt) sarebbe da controllare meglio assieme a quella dopo
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+# (ndt) dovrebbe essere inteso il Version
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "Manca la directory di liste %spartial."
+msgid "Version '%s' for '%s' was not found"
+msgstr "Version \"%s\" per \"%s\" non trovato"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Manca la directory di archivio %spartial."
+msgid "Couldn't find task '%s'"
+msgstr "Impossibile trovare il task \"%s\""
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossibile bloccare la directory %s"
+msgid "Couldn't find any package by regex '%s'"
+msgstr ""
+"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:615
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Scaricamento file %li di %li (%s rimanente)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Impossibile trovare alcun pacchetto tramite il glob \"%s\""
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Scaricamento file %li di %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 ""
-"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"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
-
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossibile eseguire stat su %s."
+"Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
-"Il valore \"%s\" non è valido per APT::Default-Release poiché tale release "
-"non è disponibile dalle sorgenti"
+"Impossibile selezionare la versione installata o la candidata dal pacchetto "
+"\"%s\" poiché non sono presenti"
 
-#: apt-pkg/policy.cc:422
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 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)"
+"Impossibile selezionare la versione più recente dal pacchetto \"%s\" poiché "
+"è virtuale"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 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:503 apt-pkg/packagemanager.cc:533
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Impossibile configurare \"%s\". "
+"Impossibile selezionare la versione candidata dal pacchetto %s poiché non ha "
+"alcun candidato"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"Impossibile selezionare la versione installata dal pacchetto %s poiché non è "
+"installato"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2592,56 +2788,87 @@ msgstr "Scrittura nuovo elenco sorgenti\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Impossibile eseguire stat su %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Generazione albero delle dipendenze"
 
-#: 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: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/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Apertura del file di stato %s non riuscita"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Scrittura del file temporaneo di stato %s non riuscita"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Invia lo scenario al solver"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Invia la richiesta al solver"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Preparazione alla ricezione della soluzione"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr "Il solver esterno è terminato senza un errore di messaggio"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Esecuzione solver esterno"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Impossibile analizzare il file di pacchetto %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Scritti %i record.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Impossibile analizzare il file di pacchetto %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Scritti %i record con %i file mancanti.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Scritti %i record con %i file senza corrispondenze\n"
+
+#: 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 ""
+"Scritti %i record con %i file mancanti e %i file senza corrispondenze\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Impossibile trovare il record di autenticazione per %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash non corrispondente per %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2668,6 +2895,226 @@ msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Voce \"Date\" nel file Release %s non valida"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Il sistema di pacchetti \"%s\" non è supportato"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr "Avanzamento: [%3i%%]"
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Esecuzione di dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Impossibile configurare \"%s\". "
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Cache dei pacchetti vuota"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Il file della cache dei pacchetti è danneggiato"
+
+#: 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: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: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: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:321
+msgid "Depends"
+msgstr "Dipende"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Pre-dipende"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Consiglia"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Raccomanda"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Va in conflitto"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Sostituisce"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Rende obsoleto"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Rompe"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Migliora"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "importante"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "richiesto"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standard"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opzionale"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Il file fornisce"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Il file indice di tipo \"%s\" non è supportato"
+
+#: 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/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2754,251 +3201,150 @@ msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 "Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s"
 
-# (ndt) dovrebbe essere inteso il file Release
-#: 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:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version \"%s\" per \"%s\" non trovato"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Impossibile trovare il task \"%s\""
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
-"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
+"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Impossibile trovare alcun pacchetto tramite il glob \"%s\""
+msgid "Unable to parse package file %s (1)"
+msgstr "Impossibile analizzare il file di pacchetto %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Impossibile analizzare il file di pacchetto %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Impossibile selezionare la versione installata o la candidata dal pacchetto "
-"\"%s\" poiché non sono presenti"
+"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
+"usati quelli vecchi."
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Il blocco vendor %s non contiene impronte"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Impossibile eseguire stat sul punto di mount %s"
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Esecuzione di stat sul CD-ROM non riuscita"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "Installazione di %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opzione a riga di comando \"%c\" [da %s] sconosciuta."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "Configurazione di %s"
+msgid "Command line option %s is not understood"
+msgstr "Opzione a riga di comando %s non comprensibile"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "Rimozione di %s"
+msgid "Command line option %s is not boolean"
+msgstr "Opzione a riga di comando %s non booleana"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "Rimozione completa di %s"
+msgid "Option %s requires an argument."
+msgstr "L'opzione %s richiede un argomento."
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Notata la sparizione di %s"
+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/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Esecuzione comando di post installazione %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "L'opzione %s richiede un argomento intero, non \"%s\""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Directory \"%s\" mancante"
+msgid "Option '%s' is too long"
+msgstr "Opzione \"%s\" troppo lunga"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Impossibile aprire il file \"%s\""
+msgid "Sense %s is not understood, try true or false."
+msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"."
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "Preparazione di %s"
+msgid "Invalid operation %s"
+msgstr "Operazione %s non valida"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "Estrazione di %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Tipo di abbreviazione non riconosciuto: \"%c\""
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Preparazione alla configurazione di %s"
+msgid "Opening configuration file %s"
+msgstr "Apertura file di configurazione %s"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "Pacchetto %s installato"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Preparazione alla rimozione di %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Errore di sintassi %s:%u: tag non corretto"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "Pacchetto %s rimosso"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Preparazione alla rimozione completa di %s"
+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/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "Pacchetto %s rimosso completamente"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr "ioctl(TIOCGWINSZ) non riuscita"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate"
 
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid "Can not write log (%s)"
-msgstr "Impossibile scrivere il registro (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1069
-msgid "Is /dev/pts mounted?"
-msgstr "È /dev/pts montato?"
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr "stdout è un terminale?"
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "L'operazione è stata interrotta prima di essere completata"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Segnalazione apport non scritta poiché il messaggio di errore indica la "
-"presenza di un fallimento precedente."
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Segnalazione apport non scritta poiché il messaggio di errore indica un "
-"errore per disco pieno."
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Segnalazione apport non scritta poiché il messaggio di errore indica un "
-"errore di memoria esaurita."
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Segnalazione apport non scritta poiché il messaggio di errore indica un "
-"errore nel sistema locale."
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-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."
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Errore di sintassi %s:%u: incluso da qui"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un "
-"altro processo potrebbe tenerla occupata."
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata"
 
-#: apt-pkg/deb/debsystem.cc:94
+# (ndt) sarebbe da controllare meglio...
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"Impossibile acquisire il blocco sulla directory di amministrazione (%s). È "
-"necessario essere root."
+"Errore di sintassi %s:%u: la direttiva clear richiede un albero di opzioni "
+"come argomento"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg è stato interrotto. È necessario eseguire \"%s\" per correggere il "
-"problema. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Non bloccato"
+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/fileutl.cc:190
 #, c-format
@@ -3119,54 +3465,11 @@ msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
 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%%"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Selezione %s non trovata"
+msgid "No keyring installed in %s."
+msgstr "Nessun portachiavi installato in %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3225,527 +3528,239 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "No keyring installed in %s."
-msgstr "Nessun portachiavi installato in %s."
+msgid "%c%s... Error!"
+msgstr "%c%s... Errore"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Opzione a riga di comando \"%c\" [da %s] sconosciuta."
+msgid "%c%s... Done"
+msgstr "%c%s... Fatto"
 
-#: 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/progress.cc:181
+msgid "..."
+msgstr "..."
 
-#: apt-pkg/contrib/cmndline.cc:168
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Opzione a riga di comando %s non booleana"
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "L'opzione %s richiede un argomento."
+msgid "%lid %lih %limin %lis"
+msgstr "%lig %lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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>."
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "L'opzione %s richiede un argomento intero, non \"%s\""
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opzione \"%s\" troppo lunga"
+msgid "%lis"
+msgstr "%lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"."
+msgid "Selection %s not found"
+msgstr "Selezione %s non trovata"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Impossibile eseguire mkstemp %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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "L'elenco dell'estensione del pacchetto è troppo lungo"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Errore nell'elaborare la directory %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
+"Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un "
+"altro processo potrebbe tenerla occupata."
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Errore nell'elaborare i contenuti %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-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 "Unable to lock the administration directory (%s), are you root?"
 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:841
-msgid "No selections matched"
-msgstr "Nessuna selezione corrisponde"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Il database era danneggiato, il file è stato rinominato in %s.old"
+"Impossibile acquisire il blocco sulla directory di amministrazione (%s). È "
+"necessario essere root."
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Il database è vecchio, tentativo di aggiornamento %s"
-
-#: ftparchive/cachedb.cc:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Impossibile aprire il file del database %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Esecuzione di readlink su %s non riuscita"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "L'archivio non ha un campo \"control\""
-
-#: ftparchive/cachedb.cc:594
-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"
+"dpkg è stato interrotto. È necessario eseguire \"%s\" per correggere il "
+"problema. "
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Visita dell'albero non riuscita"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non bloccato"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "Apertura di %s non riuscita"
+msgid "Installing %s"
+msgstr "Installazione di %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Delink %s [%s]\n"
+msgid "Configuring %s"
+msgstr "Configurazione di %s"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Esecuzione di readlink su %s non riuscita"
+msgid "Removing %s"
+msgstr "Rimozione di %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Esecuzione di unlink su %s non riuscita"
+msgid "Completely removing %s"
+msgstr "Rimozione completa di %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Collegamento di %s a %s non riuscito"
+msgid "Noting disappearance of %s"
+msgstr "Notata la sparizione di %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Raggiunto il limite di DeLink di %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "L'archivio non ha un campo \"package\""
+msgid "Running post-installation trigger %s"
+msgstr "Esecuzione comando di post installazione %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s non ha un campo override\n"
+msgid "Directory '%s' missing"
+msgstr "Directory \"%s\" mancante"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  il responsabile di %s è %s non %s\n"
+msgid "Could not open file '%s'"
+msgstr "Impossibile aprire il file \"%s\""
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s non ha un campo source override\n"
+msgid "Preparing %s"
+msgstr "Preparazione di %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s non ha neppure un campo binario override\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Allocazione della memoria non riuscita"
+msgid "Unpacking %s"
+msgstr "Estrazione di %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "Unable to open %s"
-msgstr "Impossibile aprire %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Override %s riga %llu malformato (%s)"
+msgid "Preparing to configure %s"
+msgstr "Preparazione alla configurazione di %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Lettura del file override %s non riuscita"
+msgid "Installed %s"
+msgstr "Pacchetto %s installato"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Override %s riga %llu malformato #1"
+msgid "Preparing for removal of %s"
+msgstr "Preparazione alla rimozione di %s"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Override %s riga %llu malformato #2"
+msgid "Removed %s"
+msgstr "Pacchetto %s rimosso"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Override %s riga %llu malformato #3"
+msgid "Preparing to completely remove %s"
+msgstr "Preparazione alla rimozione completa di %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo di compressione \"%s\" sconosciuto"
+msgid "Completely removed %s"
+msgstr "Pacchetto %s rimosso completamente"
 
-#: ftparchive/multicompress.cc:103
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "L'output compresso %s necessita di un insieme di compressione"
+msgid "Can not write log (%s)"
+msgstr "Impossibile scrivere il registro (%s)"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Creazione di FILE* non riuscita"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr "È /dev/pts montato?"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Fork non riuscita"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr "stdout è un terminale?"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Sottoprocesso compresso"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "L'operazione è stata interrotta prima di essere completata"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Errore interno, creazione di %s non riuscita"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Segnalazione apport non scritta poiché è stato raggiunto il valore massimo "
+"di MaxReports"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "I/O al sottoprocesso/file non riuscito"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Lettura durante l'elaborazione MD5 non riuscita"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Segnalazione apport non scritta poiché il messaggio di errore indica la "
+"presenza di un fallimento precedente."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema nell'unlink di %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Segnalazione apport non scritta poiché il messaggio di errore indica un "
+"errore per disco pieno."
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Segnalazione apport non scritta poiché il messaggio di errore indica un "
+"errore di memoria esaurita."
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Record del pacchetto sconosciuto."
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Segnalazione apport non scritta poiché il messaggio di errore indica un "
+"errore nel sistema locale."
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Segnalazione apport non scritta poiché il messaggio di errore indica un "
+"errore di I/O di dpkg."
+
+#~ msgid "ioctl(TIOCGWINSZ) failed"
+#~ msgstr "ioctl(TIOCGWINSZ) non riuscita"
+
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Errore interno, Upgrade ha rovinato qualche cosa"
 
 #~ 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 718f42757..c79bfbf28 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8 bit\n"
-"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: cmdline/apt-cache.cc:149
 #, c-format
@@ -97,75 +97,75 @@ msgstr "��有容�: "
 msgid "Package file %s is out of sync."
 msgstr "Package ファイル %s ��期�����ん。"
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "検索パターン��ょ�� 1 ���指定������"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "��コマンド�時代�れ��。'apt-mark showauto' を代�り�使用������。"
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "パッケージ %s �見��り��ん"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "パッケージファイル:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "キャッシュ��期���ら��パッケージファイルを相互�照����ん"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Pin �れ�パッケージ:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(見��り��ん)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  インストール�れ��る�ージョン: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  候補: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(��)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  パッケージ Pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  �ージョンテーブル:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -330,7 +330,7 @@ msgid "Couldn't find package %s"
 msgstr "パッケージ %s �見��り��ん"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s �手動�インストール���設定�れ���。\n"
@@ -361,7 +361,7 @@ msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ソースを�得�る��少���も 1 ��パッケージ�を指定�る必���り��"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s �ソースパッケージ�見��り��ん"
@@ -394,7 +394,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "���ダウンロード�れ�ファイル '%s' をスキップ���\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s �空�領域を測定����ん"
@@ -427,7 +427,7 @@ msgstr "ソース %s を�得\n"
 msgid "Failed to fetch some archives."
 msgstr "�����アーカイブ��得�失敗����。"
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "ダウンロードオンリーモード�パッケージ�ダウンロード�完了����"
 
@@ -436,32 +436,32 @@ msgstr "ダウンロードオンリーモード�パッケージ�ダウンロ
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "��� %s �展開�れ�ソース��る���展開をスキップ���\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "展開コマンド '%s' �失敗����。\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 "'dpkg-dev' パッケージ�インストール�れ��る��を確�������。\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ビルドコマンド '%s' �失敗����。\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "�プロセス�失敗����"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ビルド�存関係を�ェック�るパッケージを少���も 1 �指定�る必���り��"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -470,17 +470,17 @@ msgstr ""
 "%s �利用�能�アーキテク�ャ情報��り��ん。セットアップ���� apt."
 "conf(5) � APT::Architectures を�照������。"
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s �ビルド�存情報を�得����ん"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ��ビルド�存情報�指定�れ����ん。\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -489,7 +489,7 @@ msgstr ""
 "パッケージ %3$s � '%4$s' パッケージ�許�れ�������%2$s �対�る %1$s "
 "��存関係を満���������ん"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -498,14 +498,14 @@ msgstr ""
 "パッケージ %3$s �見��ら�����%2$s �対�る %1$s ��存関係を満����"
 "�����ん"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -514,7 +514,7 @@ msgstr ""
 "パッケージ %3$s �候補�ージョン��ージョン������求を満�����"
 "��%2$s �対�る %1$s ��存関係を満���������ん"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -523,30 +523,30 @@ msgstr ""
 "パッケージ %3$s �候補�ージョン�存在������%2$s �対�る %1$s ��存関"
 "係を満���������ん"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s ��存関係 %1$s を満���������ん: %3$s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s �ビルド�存関係を満���������ん���。"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "ビルド�存関係�処��失敗����"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) �変更履歴"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "サ�ート�れ��るモジュール:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -638,15 +638,20 @@ msgstr ""
 "apt-get(8)�sources.list(5)�apt.conf(5) を�照������。\n"
 "                        �� APT � Super Cow Powers 化�れ����。\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 msgid "Must specify at least one pair url/filename"
 msgstr "少���も URL / ファイル�を 1 組指定�る必���り��"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr "ダウンロード失敗"
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
+#, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -655,6 +660,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -693,8 +699,9 @@ msgstr "%s �����留�設定�れ����。\n"
 msgid "%s was already not hold.\n"
 msgstr "%s �����留�れ����ん。\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s を待�����������り��ん���"
@@ -932,7 +939,7 @@ msgstr "ソケットを作�����ん"
 msgid "Could not connect data socket, connection timed out"
 msgstr "データソケット�接続����ん���。接続�タイムアウト����"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "失敗"
 
@@ -978,7 +985,7 @@ msgstr "データソケット接続タイムアウト"
 msgid "Unable to accept connection"
 msgstr "接続を accept ����ん"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "ファイル��ッシュ���題"
 
@@ -1110,143 +1117,231 @@ msgstr "公開�を利用�������以下�署��検証���
 msgid "Empty files can't be valid archives"
 msgstr "空�ファイル�有効�アーカイブ���られ��ん"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "ファイル��書�込��エラー�発生����"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "リモート��接続�クローズ�れ�サー��ら�読�込��失敗����"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "サー��ら�読�込��失敗����"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "ファイル��書�込��エラー�発生����"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "select �失敗����"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "接続タイムアウト"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "出力ファイル��書�込��エラー�発生����"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "ヘッダ�待機中��"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "�正�ヘッダ行��"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP サー���正�リプライヘッダを�信������"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP サー���正� Content-Length ヘッダを�信������"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP サー���正� Content-Range ヘッダを�信������"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "HTTP サー��レンジサ�ート�壊れ����"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "�明�日付フォーマット��"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "�正�ヘッダ��"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "内部エラー"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "ヒット "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "�得:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "無視 "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "エラー "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [処�中]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"メディア変更: \n"
+" '%s'\n"
+"�ラベル�付��ディスクをドライブ '%s' �入れ� Enter キーを押������\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr "ソート中"
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "警告: 以下�パッケージ��証�れ����ん!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "�証�警告�上書��れ���。\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "�����パッケージを�証����ん���"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "検証����れら�パッケージをインストール����?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "�題�発生��-y オプション� --force-yes ���使用�れ���"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "%s ��得�失敗����  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部エラー�InstallPackages �壊れ�パッケージ�呼�出�れ���!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "パッケージを削除���れ��り��ん��削除�無効�������。"
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部エラー�調整�終������ん"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "���作後� %sB �ディスク容��解放�れ��。\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s �充分�空�スペース��り��ん。"
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "�題�発生��-y オプション� --force-yes ���使用�れ���"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1257,19 +1352,19 @@ msgstr ""
 "続行�る���'%s' ���フレーズをタイプ������。\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "中断����。"
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "続行����?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "�����ファイル��得�失敗����"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1277,19 +1372,19 @@ msgstr ""
 "�����アーカイブを�得����ん。apt-get update を実行�る� --fix-"
 "missing オプションを付��試��������。"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing �メディア交���在�時��サ�ート�れ����ん"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "足り��パッケージを直��������ん。"
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "インストールを中断���。"
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1300,16 +1395,16 @@ msgstr[0] ""
 "以下�パッケージ��全ファイル�別�パッケージ�上書��れ����\n"
 "システム�ら消����:"
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "注�: �れ� dpkg �より自動����行�れれ��。"
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "一連�も�を削除�るよ�����������AutoRemover を開始����ん"
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1327,15 +1422,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "以下�情報����題を解決�る���役立��も�れ��ん:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部エラー�AutoRemover �何�を破壊����"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1344,7 +1439,7 @@ msgid_plural ""
 msgstr[0] ""
 "以下�パッケージ�自動�インストール�れ�����も�必���れ����ん:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1353,7 +1448,7 @@ msgstr[0] ""
 "%lu ��パッケージ�自動�インストール�れ�����も�必���れ����"
 "ã‚“:\n"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "�れを削除�る�� 'apt-get autoremove' を利用������。"
@@ -1372,7 +1467,7 @@ msgstr ""
 "未解決��存関係��。'apt-get -f install' を実行�������� (���解法"
 "を明示������)。"
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1384,68 +1479,68 @@ msgstr ""
 "��れ�) 必��パッケージ���作��れ������り Incoming �ら移\n"
 "動�れ�������考�られ��。"
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "壊れ�パッケージ"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "以下�特別パッケージ�インストール�れ��:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "�案パッケージ:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "推奨パッケージ:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, fuzzy, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "��� %s �展開�れ�ソース��る���展開をスキップ���\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, fuzzy, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s �����留�設定�れ����。\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%lu 個�パッケージ�完全�インストール���削除�れ����ん。\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr "一覧表示"
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, fuzzy, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1453,135 +1548,117 @@ msgid_plural ""
 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."
+#: 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-get -f install' を実行�る必���る�も�れ��"
-"ん。"
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "未解決��存関係��り��。-f オプションを試������。"
+"注�: �れ�シミュレーション�����ん!\n"
+"      apt-get �実際�実行� root 権�を必�����。\n"
+"      ロック��アクティブ��る���ら�今��時点�状態�妥当性�\n"
+"      �る��言�切れ�����注�������!"
 
 #: apt-private/private-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr "�明"
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr "[インストール済��%s �アップグレード�]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 msgid "[installed,local]"
 msgstr "[インストール済��ローカル]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr "[インストール済��自動削除�]"
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 msgid "[installed,automatic]"
 msgstr "[インストール済��自動]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 msgid "[installed]"
 msgstr "[インストール済�]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr "[%s �らアップグレード�]"
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr "[設定未完了]"
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "以下�パッケージ��満�����存関係��り��:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "����%s �インストール�れ����"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "����%s �インストール�れよ�������"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "����インストール�る�������ん"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "�����れ�仮想パッケージ��"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "����インストール�れ����ん"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "����インストール�れよ�������ん"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " ���"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "以下�パッケージ��満�����存関係��り��:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "以下�パッケージ�新��インストール�れ��:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "以下�パッケージ�「削除��れ��:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "以下�パッケージ��留�れ��:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "以下�パッケージ�アップグレード�れ��:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "以下�パッケージ�「ダウングレード��れ��:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "以下�変更�止パッケージ�変更�れ��:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s ���) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1589,27 +1666,27 @@ msgstr ""
 "警告: 以下���欠パッケージ�削除�れ��。\n"
 "何を�よ�����る�本当��������場���実行�������ん!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "アップグレード: %lu 個�新�インストール: %lu 個�"
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "�インストール: %lu 個�"
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ダウングレード: %lu 個�"
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "削除: %lu 個��留: %lu 個。\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu 個�パッケージ�完全�インストール���削除�れ����ん。\n"
@@ -1618,7 +1695,7 @@ msgstr "%lu 個ã�®ãƒ‘ッケージã�Œå®Œå…¨ã�«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�¾ã�Ÿã�¯å‰Šé™¤ã�
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[Y/n]"
 
@@ -1626,35 +1703,28 @@ msgstr "[Y/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "全文検索"
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1668,39 +1738,6 @@ msgstr[0] ""
 msgid "not a real package (virtual)"
 msgstr "実際�パッケージ���り��ん (仮想)"
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "警告: 以下�パッケージ��証�れ����ん!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "�証�警告�上書��れ���。\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "�����パッケージを�証����ん���"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "検証����れら�パッケージをインストール����?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s ��得�失敗����  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1712,73 +1749,43 @@ 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/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update コマンド�引数を�り��ん"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "完了"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "ヒット "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "�得:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "無視 "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "エラー "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [処�中]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"メディア変更: \n"
-" '%s'\n"
-"�ラベル�付��ディスクをドライブ '%s' �入れ� Enter キーを押������\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s を読�込む�������ん"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1850,36 +1857,428 @@ msgstr "�����。�れを修正��「導入�を�度実行��
 msgid "Merging available information"
 msgstr "入手�能情報をマージ�����"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "リンク�れ��るノード� DropNode �呼�れ���"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "�ッシュ�素を特定�る�������ん!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s �状態を�得����ん"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "diversion �割り当��失敗����"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s �書�込���ん"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion ��内部エラー"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr ""
+"debconf ��ージョンを�得����ん。debconf �インストール�れ�����?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "パッケージ拡張�リスト�長����"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "%s -> %s � %s/%s � diversion を上書��よ�������"
+msgid "Error processing directory %s"
+msgstr "ディレクトリ %s �処�中�エラー�発生����"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "ソース拡張�リスト�長����"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Contents ファイル��ヘッダ�書�込�中�エラー�発生����"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "%s -> %s � diversion �二��追加�れ����"
+msgid "Error processing contents %s"
+msgstr "Contents %s �処�中�エラー�発生����"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "�択�マッ��るも���り��ん"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "設定ファイル %s/%s ��複�����"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "パッケージファイルグループ `%s' �見当�ら��ファイル��り��"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB �壊れ������ファイル�を %s.old �変更����"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB ������%s �アップグレードを試���"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB ファイル %s を開��������ん: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s �状態を�得�る��失敗����"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "%s �リンク読��り�失敗����"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "アーカイブ�コントロールレコード��り��ん"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "アーカイブ�パッケージフィールド��り��ん���"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s � override エントリ��り��ん\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %1$s メンテナ� %3$s ���� %2$s ��\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s �ソース override エントリ��り��ん\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s ��イナリ override エントリ��り��ん\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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 �リンク解除��題�発生����"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s を %s ���変更����ん���"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1906,17 +2305,6 @@ msgstr ""
 msgid "The diversion path is too long"
 msgstr "diversion パス�長����"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1945,30 +2333,36 @@ msgstr "ファイル %s/%s �パッケージ %s �も�を上書����"
 msgid "Unable to stat %s"
 msgstr "%s �状態を�得����ん"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "リンク�れ��るノード� DropNode �呼�れ���"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s �クローズ�失敗����"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "�ッシュ�素を特定�る�������ん!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "diversion �割り当��失敗����"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion ��内部エラー"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "'%s' メン�ー������正�� DEB アーカイブ���り��ん"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "%s -> %s � %s/%s � diversion を上書��よ�������"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "内部エラー�メン�ー %s を特定����ん"
+msgid "Double add of diversion %s -> %s"
+msgstr "%s -> %s � diversion �二��追加�れ����"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "解�����コントロールファイル"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "設定ファイル %s/%s ��複�����"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -2016,205 +2410,52 @@ msgstr "tar ãƒ�ェックサム検証ã�Œå¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚アーカイブã�Œå£
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知� TAR ヘッダタイプ %u�メン�ー %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr "進�: [%3i%%]"
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "dpkg を実行�����"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "パッケージングシステム '%s' �サ�ート�れ����ん"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "�切�パッケージシステムタイプを特定����ん"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i レコードを書�込����。\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i レコードを書�込����。%i 個�ファイル�存在���ん。\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i レコードを書�込����。%i 個������ファイル��り��。\n"
-
-#: 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 ""
-"%i レコードを書�込����。%i 個�ファイル�見��ら��%i 個������"
-"ファイル��り��。\n"
-
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "�証レコード�見��り��ん: %s"
-
-#: apt-pkg/indexcopy.cc:521
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "�ッシュサム������ん: %s"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"パッケージリスト���ステータスファイルを解釈���オープン�る������"
-"�ん。"
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"�れら��題を解決�る���� apt-get update を実行�る必���る�も�れ�"
-"�ん"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "ソース�リストを読む�������ん。"
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "空�パッケージキャッシュ"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "パッケージキャッシュファイル�壊れ����"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "��パッケージキャッシュファイル�互�性����ージョン��"
-
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "パッケージキャッシュファイル�壊れ����。短�����"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "'%s' メン�ー������正�� DEB アーカイブ���り��ん"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "�� APT ��ージョニングシステム '%s' をサ�ート�����ん"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "パッケージキャッシュ�異�るアーキテク�ャ用�構築�れ����"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "�存"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "先行�存"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "�案"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "推奨"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "競�"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "置�"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "廃止"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "破壊"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "æ‹¡å¼µ"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "��"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "�求"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "標準"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "任�"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "特別"
+msgid "Internal error, could not locate member %s"
+msgstr "内部エラー�メン�ー %s を特定����ん"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "メソッドドライ� %s �見��り��ん。"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "解�����コントロールファイル"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "パッケージ %s �インストール�れ�����?"
+msgid "List directory %spartial is missing."
+msgstr "リストディレクトリ %spartial �見��り��ん。"
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "メソッド %s �正常�開始���ん���"
+msgid "Archives directory %spartial is missing."
+msgstr "アーカイブディレクトリ %spartial �見��り��ん。"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"'%s' �ラベル�付��ディスクをドライブ '%s' �入れ� Enter キーを押����"
-"��。"
+msgid "Unable to lock directory %s"
+msgstr "ディレクトリ %s をロック����ん"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "インデックスファイル�タイプ '%s' �サ�ート�れ����ん"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "状態ファイル %s �オープン�失敗����"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "ファイルを�得����� %li/%li (残り %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "一時状態ファイル %s �書�込��失敗����"
+msgid "Retrieving file %li of %li"
+msgstr "ファイルを�得����� %li/%li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2233,7 +2474,7 @@ msgstr "サイズ������ん"
 msgid "Invalid file format"
 msgstr "�正�ファイル形�"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2242,16 +2483,16 @@ msgstr ""
 "期待�れるエントリ '%s' � Release ファイル内�見��り��ん (誤�� "
 "sources.list エントリ��壊れ�ファイル)"
 
-#: apt-pkg/acquire-item.cc:1597
+#: apt-pkg/acquire-item.cc:1589
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Release ファイル中� '%s' ��ッシュサムを見��られ��ん"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下�� ID �対��利用�能�公開���り��ん:\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2260,14 +2501,14 @@ msgstr ""
 "%s � Release ファイル�期�切れ (%s 以�無効) ��。��リ�ジトリ�ら�更新"
 "物��用�れ��ん。"
 
-#: apt-pkg/acquire-item.cc:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 "ディストリビューション�競������: %s (%s を期待������ %s を�得�"
 "���)"
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2277,12 +2518,12 @@ msgstr ""
 "ファイル�使�れ��。GPG エラー: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG エラー: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2291,12 +2532,12 @@ msgstr ""
 "パッケージ %s �ファイル��置を特定����ん。��ら���パッケージを手動"
 "�修正�る必���り�� (存在���アーキテク�ャ���)。"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "'%2$s' ��ージョン '%1$s' をダウンロード�るソース�見��り��ん"
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2304,167 +2545,120 @@ msgstr ""
 "パッケージインデックスファイル�壊れ����。パッケージ %s � Filename: "
 "フィールド��り��ん。"
 
-#: 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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s を処�中�エラー�発生���� (%s%d)"
-
-#: 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:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "�� APT �対応���る以上�数��ージョン��求�れ���。"
+msgid "The method driver %s could not be found."
+msgstr "メソッドドライ� %s �見��り��ん。"
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "�� APT �対応���る以上�数�説明��求�れ���。"
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "パッケージ %s �インストール�れ�����?"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "�� APT �対応���る以上�数��存関係�発生����。"
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "メソッド %s �正常�開始���ん���"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "パッケージ %s %s �ファイル�存�処�中�見��り��ん���"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"'%s' �ラベル�付��ディスクをドライブ '%s' �入れ� Enter キーを押����"
+"��。"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ソースパッケージリスト %s �状態を�得����ん"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"パッケージ %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/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"エラー�pkgProblemResolver::Resolve ��止����。��ら�変更�止パッケー"
+"ジ�原因��。"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ファイル�供情報を�集�����"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "�題を解決�る�������ん。壊れ�変更�止パッケージ��り��。"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s �書�込���ん"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"パッケージリスト���ステータスファイルを解釈���オープン�る������"
+"�ん。"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "ソースキャッシュ��存中� IO エラー�発生����"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"�れら��題を解決�る���� apt-get update を実行�る必���る�も�れ�"
+"�ん"
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "ベンダブロック %s ��指紋を�ん����ん"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "ソース�リストを読む�������ん。"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "リストディレクトリ %spartial �見��り��ん。"
+msgid "Release '%s' for '%s' was not found"
+msgstr "'%2$s' �リリース '%1$s' �見��り��ん���"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "アーカイブディレクトリ %spartial �見��り��ん。"
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%2$s' ��ージョン '%1$s' �見��り��ん���"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "ディレクトリ %s をロック����ん"
+msgid "Couldn't find task '%s'"
+msgstr "タスク '%s' �見��り��ん"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "ファイルを�得����� %li/%li (残り %s)"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "正�表� '%s' ��パッケージ�見��り��ん���"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:615
 #, c-format
-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 を指定�る必���り��"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "'%s' �一致�るパッケージ�見��り��ん���"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "%s �状態を�得����ん。"
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "純粋�仮想パッケージ����パッケージ '%s' ��ージョンを����ん"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, 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"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
-"�正�レコード�プリファレンスファイル %s �存在���。パッケージヘッダ��"
-"り��ん"
-
-#: apt-pkg/policy.cc:444
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "pin タイプ %s を�解����ん���"
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr "pin �優先度 (��� 0) �指定�れ����ん"
+"パッケージ '%s' �インストール済����候補��ージョン���れも存在���"
+"������ん"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"'%s' ��時設定�動作���ん。詳細����� man 5 apt.conf � APT::"
-"Immediate-Configure �項を�照������。(%d)"
+"純粋�仮想パッケージ����パッケージ '%s' �最新�ージョンを����ん"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "'%s' を設定����ん���。"
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "候補�存在������パッケージ %s �候補�ージョンを����ん"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"��インストール��競�/先行�存�ループ�原因��一時的������欠パッ"
-"ケージ %s を削除���。�れ�多��場���題�起�る原因��り��。本当�"
-"�れを行����ら�APT::Force-LoopBreak オプションを有効�������。"
+"インストール�れ�������パッケージ %s �インストール済��ージョンを�"
+"���ん。"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2548,55 +2742,88 @@ msgstr "新��ソースリストを書�込ん����\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "��ディスク�ソースリスト�エントリ:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"パッケージ %s を�インストール�る必���り���������アーカイブを見"
-"��る�������ん���。"
+msgid "Unable to stat %s."
+msgstr "%s �状態を�得����ん。"
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"エラー�pkgProblemResolver::Resolve ��止����。��ら�変更�止パッケー"
-"ジ�原因��。"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "�存関係ツリーを作������"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-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/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "状態ファイル %s �オープン�失敗����"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "一時状態ファイル %s �書�込��失敗����"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "ソル��シナリオを�信"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "ソル��リクエストを�信"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "解決を���る準備"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr "外部ソル���切�エラーメッセージ���失敗����"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "外部ソル�を実行"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "パッケージファイル %s を解釈�る�������ん (1)"
+msgid "Wrote %i records.\n"
+msgstr "%i レコードを書�込����。\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "パッケージファイル %s を解釈�る�������ん (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i レコードを書�込����。%i 個�ファイル�存在���ん。\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i レコードを書�込����。%i 個������ファイル��り��。\n"
+
+#: 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 ""
+"%i レコードを書�込����。%i 個�ファイル�見��ら��%i 個������"
+"ファイル��り��。\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "�証レコード�見��り��ん: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "�ッシュサム������ん: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2623,6 +2850,218 @@ msgstr "Release ファイル %s �無効� 'Valid-Until' エントリ��り
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Release ファイル %s �無効� 'Date' エントリ��り��"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "パッケージングシステム '%s' �サ�ート�れ����ん"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "�切�パッケージシステムタイプを特定����ん"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr "進�: [%3i%%]"
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "dpkg を実行�����"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "'%s' を設定����ん���。"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "空�パッケージキャッシュ"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "パッケージキャッシュファイル�壊れ����"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "��パッケージキャッシュファイル�互�性����ージョン��"
+
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr "パッケージキャッシュファイル�壊れ����。短�����"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "�� APT ��ージョニングシステム '%s' をサ�ート�����ん"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "パッケージキャッシュ�異�るアーキテク�ャ用�構築�れ����"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "�存"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "先行�存"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "�案"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "推奨"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "競�"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "置�"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "廃止"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "破壊"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "æ‹¡å¼µ"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "��"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "�求"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "標準"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "任�"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "特別"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "�� APT �対応���る以上�数�パッケージ�指定�れ���。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "�� APT �対応���る以上�数��ージョン��求�れ���。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "�� APT �対応���る以上�数�説明��求�れ���。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "�� APT �対応���る以上�数��存関係�発生����。"
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ソースパッケージリスト %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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "ソースキャッシュ��存中� IO エラー�発生����"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "インデックスファイル�タイプ '%s' �サ�ート�れ����ん"
+
+#: 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/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "pin �優先度 (��� 0) �指定�れ����ん"
+
 #: apt-pkg/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2702,241 +3141,144 @@ msgstr "ソースリスト %3$s ã�® %2$u è¡Œã�«ã�‚るタイプ '%1$s' ã�¯ä¸�明ã
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "ソースリスト %3$s � %2$u 個目�節 '%1$s' ��明��"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "'%2$s' �リリース '%1$s' �見��り��ん���"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%2$s' ��ージョン '%1$s' �見��り��ん���"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "タスク '%s' �見��り��ん"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "正�表� '%s' ��パッケージ�見��り��ん���"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "sources.list � 'ソース' URI を指定�る必���り��"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "'%s' �一致�るパッケージ�見��り��ん���"
+msgid "Unable to parse package file %s (1)"
+msgstr "パッケージファイル %s を解釈�る�������ん (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "純粋�仮想パッケージ����パッケージ '%s' ��ージョンを����ん"
+msgid "Unable to parse package file %s (2)"
+msgstr "パッケージファイル %s を解釈�る�������ん (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"パッケージ '%s' �インストール済����候補��ージョン���れも存在���"
-"������ん"
+"�����インデックスファイル�ダウンロード�失敗����。�れら�無視�れ"
+"る����も��代�り�使�れ��。"
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"純粋�仮想パッケージ����パッケージ '%s' �最新�ージョンを����ん"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "ベンダブロック %s ��指紋を�ん����ん"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "候補�存在������パッケージ %s �候補�ージョンを����ん"
+msgid "Unable to stat the mount point %s"
+msgstr "マウント�イント %s �状態を�得����ん"
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "CD-ROM �状態を�得�る��失敗����"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "%s をインストール�����"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "コマンドラインオプション '%c' [%s �ら] ��明��。"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "%s を設定�����"
+msgid "Command line option %s is not understood"
+msgstr "コマンドラインオプション %s を�解����ん"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "%s を削除�����"
+msgid "Command line option %s is not boolean"
+msgstr "コマンドラインオプション %s � boolean ���り��ん"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "%s を完全�削除�����"
+msgid "Option %s requires an argument."
+msgstr "オプション %s ��引数�必���。"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "%s �消失を記録�����"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "オプション %s: 設定項目�� =<値> を指定�る必���り��。"
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "インストール後トリガ %s を実行�����"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "オプション %s �� '%s' ����整数�引数�必���"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "ディレクトリ '%s' �見��り��ん"
+msgid "Option '%s' is too long"
+msgstr "オプション '%s' �長����"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "ファイル '%s' をオープン����ん���"
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s を解釈�る�������ん。true � false を試������。"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "%s を準備�����"
+msgid "Invalid operation %s"
+msgstr "�正��作 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "%s を展開�����"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "�解�����略形���: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "%s �設定を準備�����"
+msgid "Opening configuration file %s"
+msgstr "設定ファイル %s をオープン����ん���"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "%s をインストール����"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "文法エラー %s:%u: ブロック������始������。"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s �削除を準備�����"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "文法エラー %s:%u: �正�タグ��"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "%s を削除����"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "文法エラー %s:%u: 値�後�余分�ゴミ�入�����"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s を完全�削除�る準備を�����"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "文法エラー %s:%u: 命令�トップレベル���実行����"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s を完全�削除����"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr "ioctl(TIOCGWINSZ) �失敗����"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "文法エラー %s:%u: インクルード��スト�多����"
 
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid "Can not write log (%s)"
-msgstr "ログを書�込���ん (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1069
-msgid "Is /dev/pts mounted?"
-msgstr "/dev/pts �マウント�れ�����?"
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr "標準出力�ターミナル���?"
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "�作��れ�完了�る��中断�れ���"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "�存関係��題 - 未設定���������"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"エラーメッセージ���失敗�ら続�エラー��る��を示���る���レ�ート"
-"�書�込�れ��ん。"
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"エラーメッセージ�ディスクフルエラー��る��を示���る���レ�ート�書"
-"�込�れ��ん。"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"エラーメッセージ�メモリ超�エラー��る��を示���る���レ�ート�書�"
-"込�れ��ん。"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"エラーメッセージ�ローカルシステム��題��る��を示���る���レ�ート"
-"�書�込�れ��ん。"
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"エラーメッセージ� dpkg I/O エラー��る��を示���る���レ�ート�書�"
-"込�れ��ん。"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "文法エラー %s:%u: ���らインクルード�れ����"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"管�用ディレクトリ (%s) をロック����ん。�れを使�別�プロセス�動���"
-"��ん�?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "文法エラー %s:%u: 未対応�命令 '%s'"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"管�用ディレクトリ (%s) をロック����ん。root 権��実行������?"
+"文法エラー %s:%u: clear ディレクティブ��引数���オプションツリーを必��"
+"���"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg �中断�れ���。�題を修正�る�� '%s' を手動�実行�る必���り�"
-"�。"
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "ロック�れ����ん"
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "文法エラー %s:%u: ファイル�最後�余計�ゴミ��り��"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3054,54 +3396,11 @@ msgstr "ファイル %s �削除中��題�発生����"
 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%%"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "�択�れ� %s �見��り��ん"
+msgid "No keyring installed in %s."
+msgstr "%s �キーリング�インストール�れ����ん。"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3156,517 +3455,233 @@ msgid ""
 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "No keyring installed in %s."
-msgstr "%s �キーリング�インストール�れ����ん。"
+msgid "%c%s... Error!"
+msgstr "%c%s... エラー!"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "コマンドラインオプション '%c' [%s �ら] ��明��。"
+msgid "%c%s... Done"
+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/progress.cc:181
+msgid "..."
+msgstr "..."
 
-#: apt-pkg/contrib/cmndline.cc:168
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "コマンドラインオプション %s � boolean ���り��ん"
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "オプション %s ��引数�必���。"
+msgid "%lid %lih %limin %lis"
+msgstr "%li日 %li時間 %li分 %li秒"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "オプション %s: 設定項目�� =<値> を指定�る必���り��。"
+msgid "%lih %limin %lis"
+msgstr "%li時間 %li分 %li秒"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "オプション %s �� '%s' ����整数�引数�必���"
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "オプション '%s' �長����"
+msgid "%lis"
+msgstr "%li秒"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s を解釈�る�������ん。true � false を試������。"
+msgid "Selection %s not found"
+msgstr "�択�れ� %s �見��り��ん"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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?"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
-"debconf ��ージョンを�得����ん。debconf �インストール�れ�����?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "パッケージ拡張�リスト�長����"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "ディレクトリ %s �処�中�エラー�発生����"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "ソース拡張�リスト�長����"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Contents ファイル��ヘッダ�書�込�中�エラー�発生����"
+"管�用ディレクトリ (%s) をロック����ん。�れを使�別�プロセス�動���"
+"��ん�?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Contents %s �処�中�エラー�発生����"
-
-#: ftparchive/apt-ftparchive.cc:626
-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 "Unable to lock the administration directory (%s), are you root?"
 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:841
-msgid "No selections matched"
-msgstr "�択�マッ��るも���り��ん"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "パッケージファイルグループ `%s' �見当�ら��ファイル��り��"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB �壊れ������ファイル�を %s.old �変更����"
+"管�用ディレクトリ (%s) をロック����ん。root 権��実行������?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB ������%s �アップグレードを試���"
-
-#: ftparchive/cachedb.cc:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"DB フォーマット�無効��。apt ����ージョン�ら更新�����れ��データ"
-"ベースを削除���作�������。"
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "DB ファイル %s を開��������ん: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s �リンク読��り�失敗����"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "アーカイブ�コントロールレコード��り��ん"
-
-#: ftparchive/cachedb.cc:594
-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 "ツリー内��移動�失敗����"
+"dpkg �中断�れ���。�題を修正�る�� '%s' を手動�実行�る必���り�"
+"�。"
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s �オープン�失敗����"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "ロック�れ����ん"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " リンク %s [%s] を外���\n"
+msgid "Installing %s"
+msgstr "%s をインストール�����"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "%s �リンク読��り�失敗����"
+msgid "Configuring %s"
+msgstr "%s を設定�����"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "%s �リンク解除�失敗����"
+msgid "Removing %s"
+msgstr "%s を削除�����"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s を %s �リンク�る��失敗����"
+msgid "Completely removing %s"
+msgstr "%s を完全�削除�����"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " リンクを外�制�� %sB �到�����。\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "アーカイブ�パッケージフィールド��り��ん���"
+msgid "Noting disappearance of %s"
+msgstr "%s �消失を記録�����"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s � override エントリ��り��ん\n"
+msgid "Running post-installation trigger %s"
+msgstr "インストール後トリガ %s を実行�����"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %1$s メンテナ� %3$s ���� %2$s ��\n"
+msgid "Directory '%s' missing"
+msgstr "ディレクトリ '%s' �見��り��ん"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s �ソース override エントリ��り��ん\n"
+msgid "Could not open file '%s'"
+msgstr "ファイル '%s' をオープン����ん���"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ��イナリ override エントリ��り��ん\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - メモリ�割り当��失敗����"
+msgid "Preparing %s"
+msgstr "%s を準備�����"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "Unable to open %s"
-msgstr "'%s' をオープン����ん"
+msgid "Unpacking %s"
+msgstr "%s を展開�����"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "�正� override %s %llu 行目 (%s)"
+msgid "Preparing to configure %s"
+msgstr "%s �設定を準備�����"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "override ファイル %s を読�込む��失敗����"
+msgid "Installed %s"
+msgstr "%s をインストール����"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "�正� override %s %llu 行目 #1"
+msgid "Preparing for removal of %s"
+msgstr "%s �削除を準備�����"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "�正� override %s %llu 行目 #2"
+msgid "Removed %s"
+msgstr "%s を削除����"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "�正� override %s %llu 行目 #3"
+msgid "Preparing to completely remove %s"
+msgstr "%s を完全�削除�る準備を�����"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' �未知�圧縮アルゴリズム��"
+msgid "Completely removed %s"
+msgstr "%s を完全�削除����"
 
-#: ftparchive/multicompress.cc:103
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "圧縮出力 %s ��圧縮セット�必���"
+msgid "Can not write log (%s)"
+msgstr "ログを書�込���ん (%s)"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE* �作��失敗����"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr "/dev/pts �マウント�れ�����?"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork �失敗����"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr "標準出力�ターミナル���?"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "圧縮�プロセス"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "�作��れ�完了�る��中断�れ���"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "内部エラー�%s �作��失敗����"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "MaxReports ��������る���レ�ート�書�込�れ��ん"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "�プロセス/ファイル�� IO �失敗����"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "�存関係��題 - 未設定���������"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5 �計算中�読�込��失敗����"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"エラーメッセージ���失敗�ら続�エラー��る��を示���る���レ�ート"
+"�書�込�れ��ん。"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s �リンク解除��題�発生����"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"エラーメッセージ�ディスクフルエラー��る��を示���る���レ�ート�書"
+"�込�れ��ん。"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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 "�明�パッケージレコード��!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"エラーメッセージ�ローカルシステム��題��る��を示���る���レ�ート"
+"�書�込�れ��ん。"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"エラーメッセージ� dpkg I/O エラー��る��を示���る���レ�ート�書�"
+"込�れ��ん。"
+
+#~ msgid "ioctl(TIOCGWINSZ) failed"
+#~ msgstr "ioctl(TIOCGWINSZ) �失敗����"
+
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "内部エラー�アップグレード�何�壊れ���"
diff --git a/po/km.po b/po/km.po
index 037fc90cd..9202b6072 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,14 +10,15 @@ 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
-"Language: \n"
+"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.2\n"
 
 #: cmdline/apt-cache.cc:149
@@ -102,75 +103,75 @@ msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប
 msgid "Package file %s is out of sync."
 msgstr "ឯកសារ​កញ្ចប់ %s នៅ​�ាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។"
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "អ្នក​�្រូវ​�ែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិ�​ប្រាកដ"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "មិន​អាច​កំណ�់​ទី�ាំង​កញ្ចប់ %s បានឡើយ"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "ឯកសារ​កញ្ចប់ ៖"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "កញ្ចប់​ដែល​បាន​�្ទាស់ ៖"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(រក​មិន​ឃើញ)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  បាន​ដំឡើង ៖ "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  សាកល្បង ៖ "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(គ្មាន)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  �្ទាស់​កញ្ចប់ ៖ "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  �ារាង​កំណែ ៖"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -332,7 +333,7 @@ msgid "Couldn't find package %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ប៉ុន្�ែ​ %s នឹង​�្រូវ​បាន​ដំឡើ​ង"
@@ -360,7 +361,7 @@ msgstr "មិន​អាច​ចាក់​សោ​��​ទាញ​យ
 msgid "Must specify at least one package to fetch source for"
 msgstr "យ៉ាងហោចណាស់​�្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
@@ -386,7 +387,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "មិន​អាច​កំណ�់​ទំហំ​ទំន�រ​ក្នុង​ %s បានឡើយ"
@@ -419,7 +420,7 @@ msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
 msgid "Failed to fetch some archives."
 msgstr "បរាជ�យ​ក្នុងការទៅប្រមូលយក​ប�ណ្ណសារ​មួយចំនួន ។"
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​�ែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
 
@@ -428,66 +429,66 @@ msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​áž
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ�យ​ ។\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ពិនិ�្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ�យ​ ។\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ�យ​"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr "�្រូវ�ែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិ�្យ builddeps សម្រាប់"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "មិន​អាច​សាងសង់​​ព��៌មាន​ភាពអស្រ�យ​សម្រាប់ %s"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s មិនមានភាពអាស្រ�យ​ស្�ាបនាឡើយ​ ។\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, 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:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "បរាជ�យ​ក្នុងការ​�ម្រូវចិ�្�ភាពអាស្រ�យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺ�្មីព�ក"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,37 +497,37 @@ msgstr ""
 "ភាពអាស្រ�យ %s សម្រាប់ %s មិនអាច​�ម្រូវចិ�្�បានទ� ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​�ម្រូវចិ�្�​"
 "�ម្រូវការ​កំណែបានឡើយ"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, 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:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "បរាជ�យ​ក្នុងការ​�ម្រូវចិ�្�ភាពអាស្រ�យ %s សម្រាប់ %s: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ភាពអាស្រ�យ​ដែល​បង្កើ�​ %s មិន​អាច​បំព�ញ​ស�ចក្ដី​�្រូវការ​បាន​ទ� ។"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "បាន​បរាជ�យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើ�​ភាព​អាស្រ�យ"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "កំពុង​�ភ្ជាប់​ទៅ​កាន់​ %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -611,16 +612,20 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "យ៉ាងហោចណាស់​�្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -629,6 +634,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -658,8 +664,9 @@ msgstr "%s ជាកំណែ​ដែល�្មីបំផុ�រួចទ
 msgid "%s was already not hold.\n"
 msgstr "%s ជាកំណែ​ដែល�្មីបំផុ�រួចទៅហើយ ។\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "រង់ចាំប់​ %s ប៉ុន្�ែ ​វា​មិន​នៅទីនោះ"
@@ -852,7 +859,7 @@ msgstr "មិន​អាច​បង្កើ�​រន្ធបានឡើ
 msgid "Could not connect data socket, connection timed out"
 msgstr "មិន​អាច​�ភ្ជាប់​​រន្ធទិន្នន�យ​បានឡើយ អស់​ព�ល​ក្នុងការ�ភ្ជាប់​"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "បាន​បរាជ�យ"
 
@@ -898,7 +905,7 @@ msgstr "ការ�ភ្ជាប់​រន្ធ​​ទិន្នន�
 msgid "Unable to accept connection"
 msgstr "មិនអាច​ទទួលយក​ការ�ភ្ជាប់​បានឡើយ"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "បញ្ហា​ធ្វើឲ្យ�ូច​ឯកសារ"
 
@@ -1027,142 +1034,229 @@ msgstr "ហ�្�ល��ា​�ាងក្រោម​មិន​អា
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "កំហុសក្នុងការ​សរស�រ​ទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការ�ភ្ជាប់"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "កំហុស​ក្នុងការ​សរស�រទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "ជ្រើស​បាន​បរាជ�យ​"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "ការ�ភ្ជាប់​បាន​អស់ព�ល​"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "កំហុស​ក្នុងការ​សរស�រទៅកាន់​ឯកសារលទ្ធផល"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "កំពុង​រង់ចាំ​បឋមក�ា"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "ជួរ​បឋមក�ា​�ូច​"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមក�ាចម្លើយ�បមិន�្រឹម�្រូវ"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមក�ាប្រវែង​​​មា�ិកា​មិន�្រឹម�្រូវ​"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមក�ា​ជួរ​មា�ិកា​មិន​�្រឹម�្រូវ​"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "ម៉ាស៊ីន​បម្រើ HTTP ន�ះបាន​�ូច​​​ជួរ​គាំទ្រ​"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆ�ទ"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "ទិន្នន�យ​បឋមក�ា​�ូច"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "ការ�ភ្ជាប់​បាន​បរាជ�យ​"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "កំហុស​�ាង​ក្នុង​"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "វាយ​"
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "យក​ ៖"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [កំពុង​ធ្វើការ​]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"ផ្លាស់ប្�ូរ​ម�ឌៀ ៖ សូម​បញ្ចូល​�ាស​ដែល​មាន​ស្លាក\n"
+" '%s'\n"
+"ក្នុង​ដ្រាយ​ '%s' ហើយ​ចុច​បញ្ចូល\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទា�់ភាព�្រឹម�្រូវកញ្ចប់�ាងក្រោមបានឡើយ !"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "បានបដិស�ធ​ការព្រមាន​ការផ្ទៀងផ្ទា�់ភាព​�្រឹម�្រូវ ។\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "មិនអាច​ផ្ទៀងផ្ទា�់ភាព�្រឹម�្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
+
+#: apt-private/private-download.cc:50
+#, fuzzy
+msgid "Install these packages without verification?"
+msgstr "ដំឡើង​កញ្ចប់​ទាំងន�ះ ​ដោយគ្មានការពិនិ�្យ​បញ្ជាក់ [y/N] ? "
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "មាន​បញ្ហា​ ហើយ -y �្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "បរាជ�យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "កំហុស​�ាងក្នុង កញ្ចប់​ដំឡើង​�្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​�ូច !"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "កញ្ចប់ ​�្រូវការឲ្យ​យក​ច�ញ​​ ប៉ុន្�ែមិនអនុញ្ញា�​ឲ្យយកច�ញឡើយ ។"
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "កំហុស​�ាងក្នុង​ ការ​រៀប​�ាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​�ាសនឹង​​ទំន�រ ។ \n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "អ្នក​គ្មាន​ទំហំ​​ទំន�រ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "មាន​បញ្ហា​ ហើយ -y �្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​�្ញុំ​និយាយ !"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1173,20 +1267,20 @@ msgstr ""
 "ដើម្បី​បន្� ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "បោះបង់ ។"
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "�ើ​អ្នក​ចង់​បន្�ឬ​ [បាទ ចាស/ទ�​] ? "
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ�យ​ក្នុង​ការ​ទាញ​យក​"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1194,19 +1288,19 @@ msgstr ""
 "អនុញ្ញា�​ឲ្យ​ទៅ​ប្រមូល​យក​ប�ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រ�់​ភាព​ទាន់​សម�យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --"
 "fix- ដែលបា�់ឬ់ ?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix- ដែលបា�់​ និង ​ស្វប​ម�ឌៀ​ដែល​មិនបាន​​គាំទ្រនៅព�ល​បច្ចុប្បន្ន​"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបា�់បង់​បានឡើយ ។"
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1216,15 +1310,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1240,16 +1334,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "ព��៌មាន​ដូច�ទៅន�ះ អាចជួយ​ដោះស្រាយ​ស្�ានភាព​បាន ៖"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "កំហុស​�ាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យ�ូច​ឧបករណ�"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1259,7 +1353,7 @@ msgid_plural ""
 msgstr[0] "កញ្ចប់​�្មី​�ាងក្រោម​នឹង​�្រូវ​បាន​ដំឡើង​ ៖"
 msgstr[1] "កញ្ចប់​�្មី​�ាងក្រោម​នឹង​�្រូវ​បាន​ដំឡើង​ ៖"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1267,7 +1361,7 @@ msgid_plural ""
 msgstr[0] "កញ្ចប់​�្មី​�ាងក្រោម​នឹង​�្រូវ​បាន​ដំឡើង​ ៖"
 msgstr[1] "កញ្ចប់​�្មី​�ាងក្រោម​នឹង​�្រូវ​បាន​ដំឡើង​ ៖"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
@@ -1284,7 +1378,7 @@ msgid ""
 msgstr ""
 "ភាពអស្រ�យ​ដែល​�ុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1296,68 +1390,68 @@ msgstr ""
 "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើ�​ឡើយ​\n"
 " ឬ ​បានយក​ច�ញ​ពីការមកដល់ ។"
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "កញ្ចប់​ដែល​បាន​�ូច​"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "កញ្ចប់​បន្�ែម​ដូច�ទៅន�ះ នឹង�្រូវបាន​ដំឡើង ៖"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន� ៖"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណ�់​​ ។\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណ�់​​ ។\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទ� វា​មិនអាច�្រូវបាន​ទាញយកបានឡើយ ។\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ជាកំណែ​ដែល�្មីបំផុ�រួចទៅហើយ ។\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទ�​ ដូច្ន�ះ មិន​បាន​យកច�ញឡើយ \n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទ�​ ដូច្ន�ះ មិន​បាន​យកច�ញឡើយ \n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1365,136 +1459,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [បានដំឡើង​]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [បានដំឡើង​]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [បានដំឡើង​]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [បានដំឡើង​]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "កញ្ចប់​�ាងក្រោម​មាន​ភាពអាស្រ�យ​ដែល​�ុស​គ្នា ៖"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "ប៉ុន្�ែ​ %s �្រូវ​បាន​ដំឡើង​"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ប៉ុន្�ែ​ %s នឹង​�្រូវ​បាន​ដំឡើ​ង"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ប៉ុន្�ែ​​វា​មិន​អាច​ដំឡើង​បាន​ទ�​"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "ប៉ុន្�ែ​​វា​ជា​កញ្ចប់​និម្មិ�​"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "ប៉ុន្�ែ​វា​មិន​បាន​ដំឡើង​ទ�​"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "ប៉ុន្�ែ វា​នឹង​មិន​�្រូវ​បាន​ដំឡើង​ទ�"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " ឬ"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "កញ្ចប់​�ាងក្រោម​មាន​ភាពអាស្រ�យ​ដែល​�ុស​គ្នា ៖"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "កញ្ចប់​�្មី​�ាងក្រោម​នឹង​�្រូវ​បាន​ដំឡើង​ ៖"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "កញ្ចប់​�ាងក្រោម​នឹង�្រូវ​បាន​យកច�ញ ៖"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "​កញ្ចប់​�ាង​ក្រោម​�្រូវ​បាន​យក​�្រឡប់​មក​វិញ ៖"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "កញ្ចប់​�ាងក្រោម​នឹង​​�្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "កញ្ចប់​�ាងក្រោម​នឹង​​�្រូវ​បាន​បន្ទាប ៖"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "កញ្ចប់​រង់ចាំ​�ាងក្រោម​នឹង​�្រូវ​​បានផ្លាស់​​ប្�ូរ​ ៖"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (ដោយ​សារ�ែ​ %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1502,27 +1576,27 @@ msgstr ""
 "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​�ាងក្រោម​នឹង​�្រូវ​បាន​យកច�ញ ។\n"
 "ការយកច�ញ​ន�ះ​មិន​�្រូវ​បានធ្វើ​ទ�​លុះ�្រា​�ែ​អ្នកដឹង​�ា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu �្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu �្រូវ​បានដំឡើង​�្មី "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu �្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu ​�្រូវបានបន្ទាប់ "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu ដែល�្រូវ​យក​ច�ញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ច�ញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
@@ -1531,7 +1605,7 @@ msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ច�ញប
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1539,36 +1613,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1582,36 +1648,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទា�់ភាព�្រឹម�្រូវកញ្ចប់�ាងក្រោមបានឡើយ !"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "បានបដិស�ធ​ការព្រមាន​ការផ្ទៀងផ្ទា�់ភាព​�្រឹម�្រូវ ។\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "មិនអាច​ផ្ទៀងផ្ទា�់ភាព�្រឹម�្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
-
-#: apt-private/private-download.cc:50
-#, fuzzy
-msgid "Install these packages without verification?"
-msgstr "ដំឡើង​កញ្ចប់​ទាំងន�ះ ​ដោយគ្មានការពិនិ�្យ​បញ្ជាក់ [y/N] ? "
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "បរាជ�យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1622,74 +1658,44 @@ msgstr "បរាជ�យ​ក្នុង​ការ​ប្�ូរ​ឈ
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម�យ​គ្មាន​អាគុយម៉ង់​ទ�"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "ធ្វើរួច​"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "វាយ​"
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "យក​ ៖"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [កំពុង​ធ្វើការ​]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"ផ្លាស់ប្�ូរ​ម�ឌៀ ៖ សូម​បញ្ចូល​�ាស​ដែល​មាន​ស្លាក\n"
-" '%s'\n"
-"ក្នុង​ដ្រាយ​ '%s' ហើយ​ចុច​បញ្ចូល\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "មិន​អាច​អាន​ %s បានឡើយ"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1763,36 +1769,429 @@ msgstr "នៅ�ាងលើ​សារ​ន�ះ​គឺ​សំ�ាន
 msgid "Merging available information"
 msgstr "បញ្ចូល​​ព��៌មាន​ដែលមាន​ចូល​គ្នា"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "បរាជ�យ​ក្នុងការ​ដាក់ទី�ាំង​ធា�ុ​ដែលរាយប៉ាយ !"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "មិន​អាច​�្លែង %s បានឡើយ"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "បរាជ�យ​ក្នុងការ​បម្រុងទុក​ការបង្វែរ"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "មិន​អាច​សរស�រ​ទៅ %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "កំហុស​�ាងក្នុង នៅក្នុង AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ �ើ​ debconf បានដំឡើង​ឬ ?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "បញ្ជី​ផ្នែក​បន្�ែម​កញ្ចប់​វែង​ព�ក"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "កំពុង​ព្យាយាម​សរស�រ​ជាន់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s"
+msgid "Error processing directory %s"
+msgstr "​កំហុស​ដំណើរការ​��​ %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "បញ្ជី​ផ្នែក​បន្�ែម​ប្រភព​វែង​ព�ក"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "កំហុស​សរស�រ​បឋម​ក�ា​ទៅ​ឯកសារ​មា�ិកា"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "ការបន្�ែម​ស្ទួន នៃការបង្វែរ​ %s -> %s"
+msgid "Error processing contents %s"
+msgstr "កំហុស​ដំណើរការ​មា�ិកា​ %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "ឯកសារ​កំណ�់​រចនាសម្ព�ន្ធ​ស្ទួន​ %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "ឯកសារ​មួយ​ចំនួន​បា�់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB បាន​�ូច​, ឯកសារ​បាន​ប្�ូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
+
+#: ftparchive/cachedb.cc:94
+#, 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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទ� %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "បាន​បរាជ�យ​ក្នុង​ការ�្លែង  %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "បាន​បរាជ�យ​ក្នុង​ការ​អាន​�ំណ​ %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "ប�ណ្ណសារ​គ្មាន​កំណ�់​�្រា​�្រួ�​ពិនិ�្យ​ទ�​"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "ប�ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s គ្មាន​ធា�ុធា�ុបញ្ចូល​​បដិស�ធឡើយ\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  អ្នក​�ែទាំ %s គឺ %s មិនមែន​ %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s គ្មាន​ធា�ុ​បដិស�ធ​ប្រភព\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s គ្មាន​ធា�ុប​ដិស�ធគោល​ពីរ​ដែរ\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "បរាជ�យ​ក្នុង​ការ​ប្�ូរ​ឈ្មោះ %s ទៅ %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1818,17 +2217,6 @@ msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរáž
 msgid "The diversion path is too long"
 msgstr "ផ្លូវ​បង្វែរ វែងព�ក"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1857,30 +2245,36 @@ msgstr "ឯកសារ​ %s/%s សរសáŸ�រជាន់​ពីលើ​áž
 msgid "Unable to stat %s"
 msgstr "មិន​អាច​�្លែង %s បានឡើយ"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "ទម្លាក់​�្នាំង​ដែល​បាន​ហៅ​លើ​�្នាំងដែល​នៅ�ែ�ភ្ជាប់"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "បរាជ�យ​ក្នុងការ​បិទឯកសារ %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "បរាជ�យ​ក្នុងការ​ដាក់ទី�ាំង​ធា�ុ​ដែលរាយប៉ាយ !"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "បរាជ�យ​ក្នុងការ​បម្រុងទុក​ការបង្វែរ"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "កំហុស​�ាងក្នុង នៅក្នុង AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "ន�ះ​ជាមិនមែនជា​ប�ណ្ណសារ​ DEB ​�្រឹម�្រូវទ� បា�់បង់សមាជិក​ '%s'​"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "កំពុង​ព្យាយាម​សរស�រ​ជាន់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "កំហុស​�ាងក្នុង ​មិន​អាច​កំណ�់​ទី�ាំង​សមាជិក​ %s បានឡើយ"
+msgid "Double add of diversion %s -> %s"
+msgstr "ការបន្�ែម​ស្ទួន នៃការបង្វែរ​ %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "ឯកសារ�្រួ�ពិនិ�្យ​ដែលមិនអាច​ញែកបាន"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "ឯកសារ​កំណ�់​រចនាសម្ព�ន្ធ​ស្ទួន​ %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1928,199 +2322,52 @@ msgstr "Tar ឆáŸ�កសាំ​បាន​បរាជáŸ�áž™ áž”áŸ�ណ្ណá
 msgid "Unknown TAR header type %u, member %s"
 msgstr "មិន​ស្គាល់​ប្រភ�ទ​បឋមក�ា​ TAR  %u ដែលជា​សមាជិក​ %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "មិន​គាំទ្រ​ប្រព�ន្ធ​កញ្ចប់'%s' ឡើយ"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "មិនអាច​កំណ�់​ប្រភ�ទ​ប្រព�ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "បានសរស�រ %i កំណ�់�្រា ។\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "បានសរស�រ %i កំណ�់�្រា​ជាមួយ​ %i ឯកសារ​ដែល​បា�់បង់ ។\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "បានសរស�រ​ %i កំណ�់�្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "ន�ះ​ជាមិនមែនជា​ប�ណ្ណសារ​ DEB ​�្រឹម�្រូវទ� បា�់បង់សមាជិក​ '%s'​"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "បានសរស�រ %i កំណ�់�្រា​ជាមួយ​ %i ឯកសារ​ដែល​បា�់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
+msgid "Internal error, could not locate member %s"
+msgstr "កំហុស​�ាងក្នុង ​មិន​អាច​កំណ�់​ទី�ាំង​សមាជិក​ %s បានឡើយ"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "ឯកសារ�្រួ�ពិនិ�្យ​ដែលមិនអាច​ញែកបាន"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្�ានភាព​មិន​អាច�្រូវបាន​​ញែក ​​ឬ �្រូវបាន​បើកបានឡើយ​​ ។"
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម�យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងន�ះ"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "ឃ្លាំង​កញ្ចប់​ទទ�​"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​�្រឹម�្រូវ​"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "ឯកសារ​ឃ្លាំងសម្ងា�់​​កញ្ចប់​ជាកំណែ​មិន​�្រូវគ្នា​"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​�្រឹម�្រូវ​"
-
-#: apt-pkg/pkgcache.cc:174
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "APT ន�ះ មិនគាំទ្រ​ប្រព�ន្ធ​ ការធ្វើកំណែន�ះទ�​ '%s'"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "ឃ្លាំង​សម្ងា�់​កញ្ចប់�្រូវ​បានស្�ាបនា់​សម្រាប់ស្�ាប�្យករ​�ុស​ៗគ្នា​​"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "អាស្រ�យ​"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "អាស្រ�យជា​មុន"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "ផ្ដល់យោបល់​"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "ផ្�ល់​អនុសាសន�​"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "ប៉ះទង្គិច"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "ជំនួស​"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "លែង​ប្រើ"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "សំ�ាន់​"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "បាន​ទាមទារ"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "គំរូ"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "ស្រ�ចចិ�្�"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "បន្�ែម"
+msgid "List directory %spartial is missing."
+msgstr "រាយបញ្ជី​��​ %spartial គឺ​បា�់បង់​ ។"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្�្រ %s ឡើយ ។"
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "��​ប�ណ្ណសារ​ %spartial គឺ​បា�់បង់​ ។"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:99
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "ពិនិ�្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
+msgid "Unable to lock directory %s"
+msgstr "មិន​អាច​ចាក់​សោ​��​បញ្ជីបានឡើយ"
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "វិធីសាស្�្រ​ %s មិន​អាច​ចាប់​ផ្�ើម​�្រឹម�្រូវ​ទ�​"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "ប្រភ�ទ​ឯកសារ​លិបិក្រម​ '%s' មិន�្រូវ​បាន​គាំទ្រ​"
 
-#: apt-pkg/acquire-worker.cc:455
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្ក�់​ចូល ។"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ប្រភ�ទ​ឯកសារ​លិបិក្រម​ '%s' មិន�្រូវ​បាន​គាំទ្រ​"
-
-#: 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
-#, fuzzy
-msgid "Reading state information"
-msgstr "បញ្ចូល​​ព��៌មាន​ដែលមាន​ចូល​គ្នា"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-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"
+msgid "Retrieving file %li of %li"
+msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2141,35 +2388,35 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
 msgid "Invalid file format"
 msgstr "ប្រ�ិប�្�ិការ​មិន​�្រឹម�្រូវ​ %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs �ាងក្រោម​ន�ះទ� ៖\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2177,12 +2424,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2191,173 +2438,118 @@ msgstr ""
 "�្ញុំ​មិន​អាច​រកទី�ាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទ� ។ ​មាន​ន�យ​�ា​អ្នក​�្រូវការ​ជួសជុល​កញ្ចប់​ន�ះ​ដោយ​ដៃ ។ "
 "(ដោយសារ​​បា�់​ស្�ាប�្យកម្ម)"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​�្រូវ​បាន​�ូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់ន�ះ​ទ�​ %s ។"
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "ឃ្លាំងសម្ងា�់​មិន​�្រូវ​គ្នា​នឹង ប្រព�ន្ធ ធ្វើកំណែ"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្�្រ %s ឡើយ ។"
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "កំហុស​បានកើ�ឡើង​�ណៈព�ល​កំពុង​ដំណើរការ​ %s (FindPkg)"
+msgid "Is the package %s installed?"
+msgstr "ពិនិ�្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT ន�ះ​ឆបគ្នា​​  ។"
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "វិធីសាស្�្រ​ %s មិន​អាច​ចាប់​ផ្�ើម​�្រឹម�្រូវ​ទ�​"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT ន�ះ​ឆបគ្នា​ ។"
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្ក�់​ចូល ។"
 
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT ន�ះ​ឆបគ្នា​ ។"
+#: 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 "កញ្ចប់ %s �្រូវការឲ្យដំឡើង ប៉ុន្�ែ​ �្ញុំ​មិន​អាច​រក​ប�ណ្ណសារ​សម្រាប់​វា​បាន​ទ�​ ។"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ�យ​លើស​ចំនួន​ APT ន�ះ​ឆបគ្នា​ ។"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើ� ន�ះ​ប្រហែលជា បង្កដោយកញ្ចប់​"
+"ដែលបាន​ទុក ។"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​�ណៈ​ព�ល​កំពុង​ដំណើរការ​ភាពអាស្រ�យ​​ឯកសារ"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "មិន​អាច​កែ​បញ្ហាបានទ�� អ្កបានទុក​កញ្ចប់​ដែល​�ូច ។។"
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "មិនអាច�្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+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 "កំពុង​អាន​បញ្ជី​កញ្ចប់"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម�យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងន�ះ"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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 កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងា�់​ប្រភព​"
+msgid "Release '%s' for '%s' was not found"
+msgstr "រក​មិន​ឃើញ​ការ​ច�ញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្�ិ�​ម្រាម​ដៃ"
+msgid "Version '%s' for '%s' was not found"
+msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "រាយបញ្ជី​��​ %spartial គឺ​បា�់បង់​ ។"
+msgid "Couldn't find task '%s'"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "��​ប�ណ្ណសារ​ %spartial គឺ​បា�់បង់​ ។"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, 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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ�យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវា�្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
-
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "អ្នក�្រូវ�ែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
-
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "មិនអាច​�្លែង %s បានឡើយ ។"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "កំណ�់�្រា​មិន�្រឹម�្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិ�្� មិនមាន​បឋមក�ា​កញ្ចប់ទ�"
-
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, 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 "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទ�"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"ការរ�់​ការដំឡើង​ន�ះ នឹងទាមទារ​ឲ្យយកកញ្ចប់ចាំបាច់ %s បណ្ដោះអាសន្ន ដោយសារ រង្វិល ការប៉ះទង្គិច/"
-"ភាពអាស្រ�យជាមុន ។ ជាញឹកញាប់គឺ មិន�្រឹម�្រូវ ប៉ុន្�ែ ប្រសិនបើអ្នក​ពិ�ជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::"
-"Force-LoopBreak សកម្ម ។"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2438,53 +2630,87 @@ msgstr "កំពុងសរស�រ​បញ្ជី​ប្រភព​�
 msgid "Source list entries for this disc are:\n"
 msgstr "ធា�ុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​ន�ះគឺ ៖\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "កញ្ចប់ %s �្រូវការឲ្យដំឡើង ប៉ុន្�ែ​ �្ញុំ​មិន​អាច​រក​ប�ណ្ណសារ​សម្រាប់​វា​បាន​ទ�​ ។"
+msgid "Unable to stat %s."
+msgstr "មិនអាច​�្លែង %s បានឡើយ ។"
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើ� ន�ះ​ប្រហែលជា បង្កដោយកញ្ចប់​"
-"ដែលបាន​ទុក ។"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "កំពុងស្�ាបនា​មែកធាងភាពអាស្រ�យ"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-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
+#, fuzzy
+msgid "Reading state information"
+msgstr "បញ្ចូល​​ព��៌មាន​ដែលមាន​ចូល​គ្នា"
+
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+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/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+msgid "Wrote %i records.\n"
+msgstr "បានសរស�រ %i កំណ�់�្រា ។\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "បានសរស�រ %i កំណ�់�្រា​ជាមួយ​ %i ឯកសារ​ដែល​បា�់បង់ ។\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "បានសរស�រ​ %i កំណ�់�្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
+
+#: 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 "បានសរស�រ %i កំណ�់�្រា​ជាមួយ​ %i ឯកសារ​ដែល​បា�់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2511,6 +2737,214 @@ msgstr "បន្ទា�់​ដែលមិន�្រឹម�្រូវ
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "មិន​គាំទ្រ​ប្រព�ន្ធ​កញ្ចប់'%s' ឡើយ"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "មិនអាច​កំណ�់​ប្រភ�ទ​ប្រព�ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "ឃ្លាំង​កញ្ចប់​ទទ�​"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​�្រឹម�្រូវ​"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "ឯកសារ​ឃ្លាំងសម្ងា�់​​កញ្ចប់​ជាកំណែ​មិន​�្រូវគ្នា​"
+
+#: apt-pkg/pkgcache.cc:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​�្រឹម�្រូវ​"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "APT ន�ះ មិនគាំទ្រ​ប្រព�ន្ធ​ ការធ្វើកំណែន�ះទ�​ '%s'"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "ឃ្លាំង​សម្ងា�់​កញ្ចប់�្រូវ​បានស្�ាបនា់​សម្រាប់ស្�ាប�្យករ​�ុស​ៗគ្នា​​"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "អាស្រ�យ​"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "អាស្រ�យជា​មុន"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "ផ្ដល់យោបល់​"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "ផ្�ល់​អនុសាសន�​"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "ប៉ះទង្គិច"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "ជំនួស​"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "លែង​ប្រើ"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "សំ�ាន់​"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "បាន​ទាមទារ"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "គំរូ"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "ស្រ�ចចិ�្�"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "បន្�ែម"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT ន�ះ​ឆបគ្នា​​  ។"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT ន�ះ​ឆបគ្នា​ ។"
+
+#: 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:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ�យ​លើស​ចំនួន​ APT ន�ះ​ឆបគ្នា​ ។"
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "មិនអាច�្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងា�់​ប្រភព​"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "ប្រភ�ទ​ឯកសារ​លិបិក្រម​ '%s' មិន�្រូវ​បាន​គាំទ្រ​"
+
+#: 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 record in the preferences file %s, no Package header"
+msgstr "កំណ�់�្រា​មិន�្រឹម�្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិ�្� មិនមាន​បឋមក�ា​កញ្ចប់ទ�"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2586,221 +3020,142 @@ msgstr "ប្រភ�ទ​ '%s' មិន​ស្គាល់នៅលើប
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "ប្រភ�ទ​ '%s' មិន​ស្គាល់នៅលើបន្ទា�់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "រក​មិន​ឃើញ​ការ​ច�ញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "អ្នក�្រូវ�ែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
+msgid "Unable to parse package file %s (1)"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 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"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
+"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ�យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវា�្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្�ិ�​ម្រាម​ដៃ"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "មិនអាច​�្លែង ចំណុចម៉ោន %s បានឡើយ"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "បាន​ដំឡើង %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "បរាជ�យក្នុងការ​�្លែង ស៊ីឌីរ៉ូម"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "កំពុង​កំណ�់​រចនា​សម្ព�ន្ធ %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "ជម្រើស​បន្ទា�់​ពាក្យបញ្ជា '%c' [from %s] មិនស្គាល់ឡើយ ។"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "កំពុង​យក %s ច�ញ"
-
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "បាន​យក %s ច�ញ​ទាំង​ស្រុង"
+msgid "Command line option %s is not understood"
+msgstr "មិនយល់​ពី​ជម្រើស​បន្ទា�់​ពាក្យ​បញ្ជា %s ឡើយ"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Command line option %s is not boolean"
+msgstr "ជម្រើស​បន្ទា�់ពាក្យ​បញ្ជា​ %s មិនមែនជាប៊ូលីនទ�"
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "រាយបញ្ជី​��​ %spartial គឺ​បា�់បង់​ ។"
-
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+msgid "Option %s requires an argument."
+msgstr "ជម្រើស​ %s �្រូវការ​អាគុយម៉ង់មួយ ។"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Preparing %s"
-msgstr "កំពុងរៀបចំ​ %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "ជម្រើស %s ៖ ការបញ្ជាក់​ធា�ុ​កំណ�់រចនាសម្ព�ន្ធ�្រូវ�ែមាន =<val> មួយ ។"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Unpacking %s"
-msgstr "កំពុង​ស្រាយ %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "ជម្រើស​ %s �្រូវ​ការ​អាគុយម៉ង់​ចំនួន​គ�់​ មិន​មែន​ '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "កំពុងរៀបចំ​កំណ�់រចនាសម្ព�ន្ធ %s"
+msgid "Option '%s' is too long"
+msgstr "ជម្រើស​ '%s' វែងព�ក"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Installed %s"
-msgstr "បាន​ដំឡើង %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ ពិ�​ ​​​ឫ មិន​ពិ� ។"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "កំពុងរៀបចំដើម្បី​ការយក​ច�ញ​នៃ %s"
+msgid "Invalid operation %s"
+msgstr "ប្រ�ិប�្�ិការ​មិន​�្រឹម�្រូវ​ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Removed %s"
-msgstr "បាន​យក %s ច�ញ"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភ�ទ​អក្សរ​សង្��ប ៖ '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "កំពុង​រៀបចំ​យក %s ច�ញ​ទាំង​ស្រុង"
+msgid "Opening configuration file %s"
+msgstr "កំពុង​បើ​ឯកសារ​កំណ�់រចនាសម្ព�ន្ធ​ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Completely removed %s"
-msgstr "បាន​យក %s ច�ញ​ទាំង​ស្រុង"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្�ើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។"
 
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed"
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ �ម្លៃ​ឥ�បានការ​នៅ​ក្រៅ​"
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ស�ចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "មិន​អាច​ចាក់​សោ​��​បញ្ជីបានឡើយ"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ ស�ចក្ដីបង្គាប់​អាច�្រូវបានធ្វើ​�ែនៅលើ​កម្រិ�​កំពូល​�ែប៉ុណ្ណោះ"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥ�បានការ​បន្�ែម ដែលនៅ�ាងចុង​ឯកសារ"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2915,54 +3270,11 @@ msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... ធ្វើរួច​"
-
-#. 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 រក​មិន​ឃើញ​ឡើយ"
+msgid "No keyring installed in %s."
+msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3017,519 +3329,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីន�ះ​"
+msgid "%c%s... Error!"
+msgstr "%c%s... កំហុស ​!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, 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 ៖ ស�ចក្ដីបង្គាប់​អាច�្រូវបានធ្វើ​�ែនៅលើ​កម្រិ�​កំពូល​�ែប៉ុណ្ណោះ"
+msgid "%c%s... Done"
+msgstr "%c%s... ធ្វើរួច​"
 
-#: apt-pkg/contrib/configuration.cc:950
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥ�បានការ​បន្�ែម ដែលនៅ�ាងចុង​ឯកសារ"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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 មិនមែនជាប៊ូលីនទ�"
+msgid "%c%s... %u%%"
+msgstr "%c%s... ធ្វើរួច​"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "ជម្រើស​ %s �្រូវការ​អាគុយម៉ង់មួយ ។"
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "ជម្រើស %s ៖ ការបញ្ជាក់​ធា�ុ​កំណ�់រចនាសម្ព�ន្ធ�្រូវ�ែមាន =<val> មួយ ។"
+msgid "%lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "ជម្រើស​ %s �្រូវ​ការ​អាគុយម៉ង់​ចំនួន​គ�់​ មិន​មែន​ '%s'"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "ជម្រើស​ '%s' វែងព�ក"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ ពិ�​ ​​​ឫ មិន​ពិ� ។"
+msgid "Selection %s not found"
+msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "បញ្ជី​ផ្នែក​បន្�ែម​កញ្ចប់​វែង​ព�ក"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "​កំហុស​ដំណើរការ​��​ %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "បញ្ជី​ផ្នែក​បន្�ែម​ប្រភព​វែង​ព�ក"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "កំហុស​សរស�រ​បឋម​ក�ា​ទៅ​ឯកសារ​មា�ិកា"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "មិន​អាច​ចាក់​សោ​��​បញ្ជីបានឡើយ"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "កំហុស​ដំណើរការ​មា�ិកា​ %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "ឯកសារ​មួយ​ចំនួន​បា�់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB បាន​�ូច​, ឯកសារ​បាន​ប្�ូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
 
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
-"ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន�យ​មិន​�្រឹម�្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​"
-"មូលដ្ឋាន​ទិន្នន�យ​ច�ញ និង​បង្កើ�​មូលដ្ឋាន​ទិន្នន�យ​ឡើង​វិញ ។"
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទ� %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "បាន​បរាជ�យ​ក្នុង​ការ​អាន​�ំណ​ %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "ប�ណ្ណសារ​គ្មាន​កំណ�់​�្រា​�្រួ�​ពិនិ�្យ​ទ�​"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "មិន​អាច​យក​ទស្សន�ទ្រនិច​"
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "បាន​ដំឡើង %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, 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: កំហុស​អនុវ�្�​លើ​ឯកសារ​"
+msgid "Configuring %s"
+msgstr "កំពុង​កំណ�់​រចនា​សម្ព�ន្ធ %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "បរាជ�យ​ក្នុង​ការ​ដោះស្រាយ %s"
+msgid "Removing %s"
+msgstr "កំពុង​យក %s ច�ញ"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "មែក​ធាង បាន​បរាជ�យ"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "បាន​យក %s ច�ញ​ទាំង​ស្រុង"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "បរាជ�យ​ក្នុង​ការ​បើក %s"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr ""
 
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "បាន​បរាជ�យ​ក្នុង​ការ​អាន​�ំណ​ %s"
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "រាយបញ្ជី​��​ %spartial គឺ​បា�់បង់​ ។"
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "បាន​បរាជ�យ​ក្នុង​ការ​ផ្ដាច់ %s"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** បាន​បរាជ�យ​ក្នុង​ការ​�​ %s ទៅ %s"
+msgid "Preparing %s"
+msgstr "កំពុងរៀបចំ​ %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink កំណ�់​នៃ​ការ​វាយ %sB ។\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "ប�ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
+msgid "Unpacking %s"
+msgstr "កំពុង​ស្រាយ %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s គ្មាន​ធា�ុធា�ុបញ្ចូល​​បដិស�ធឡើយ\n"
+msgid "Preparing to configure %s"
+msgstr "កំពុងរៀបចំ​កំណ�់រចនាសម្ព�ន្ធ %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  អ្នក​�ែទាំ %s គឺ %s មិនមែន​ %s\n"
+msgid "Installed %s"
+msgstr "បាន​ដំឡើង %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s គ្មាន​ធា�ុ​បដិស�ធ​ប្រភព\n"
+msgid "Preparing for removal of %s"
+msgstr "កំពុងរៀបចំដើម្បី​ការយក​ច�ញ​នៃ %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s គ្មាន​ធា�ុប​ដិស�ធគោល​ពីរ​ដែរ\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - បរាជ�យ​ក្នុង​ការ​​បម្រុង​​ទុក​ស�ិ​"
+msgid "Removed %s"
+msgstr "បាន​យក %s ច�ញ"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "កំពុង​រៀបចំ​យក %s ច�ញ​ទាំង​ស្រុង"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "បាន​យក %s ច�ញ​ទាំង​ស្រុង"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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 �្រូវ​ការ​កំណ�់​ការបង្ហាប់​"
+msgid "Can not write log (%s)"
+msgstr "មិន​អាច​សរស�រ​ទៅ %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "បរាជ�យ​ក្នុង​ការ​បង្កើ�​ FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "បាន​បរាជ�យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "បង្ហាប់កូន"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "កំហុស​�ាងក្នុង​ បរាជ�យ​ក្នុង​ការ​បង្កើ�​ %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ�យ​"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "បាន​បរាជ�យ​ក្នុង​ការអាន​ នៅព�ល​គណនា MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់�ំណ %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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 "មិន​ស្គាល់​កំណ�់​�្រា​កញ្ចប់ !"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "កំហុស​�ាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ�​�ូច"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s មិនមែន​ជា​កញ្ចប់​ DEB �្រឹម�្រូវ​ទ�​ ។"
diff --git a/po/ko.po b/po/ko.po
index ec4f5f302..c1b756cf7 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -94,74 +94,74 @@ msgstr "차지하는 전체 용량: "
 msgid "Package file %s is out of sync."
 msgstr "패키지 파� %s 파�� �기화�지 않았습니다."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "최소 한 개� 검색어를 지정해야 합니다"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%s 패키지를 찾� 수 없습니다"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "패키지 파�:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "�시가 �기화�지 않았습니다. 패키지 파�� �호 참조할 수 없습니다"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "핀 패키지:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(없�)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  설치: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  후보: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(없�)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  패키지 핀: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  버전 테�블:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -323,7 +323,7 @@ msgid "Couldn't find package %s"
 msgstr "%s 패키지를 찾� 수 없습니다"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 패키지 수�설치로 지정합니다.\n"
@@ -351,7 +351,7 @@ msgstr "다운로드 디렉터리를 잠글 수 없습니다"
 msgid "Must specify at least one package to fetch source for"
 msgstr "해당�는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s� 소스 패키지를 찾� 수 없습니다"
@@ -382,7 +382,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "�미 다운로드 받� 파� '%s'�(는) 다시 받지 않고 건너 �니다.\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s� 여유 공간� �기를 파악할 수 없습니다"
@@ -415,7 +415,7 @@ msgstr "%s 소스를 가져옵니다\n"
 msgid "Failed to fetch some archives."
 msgstr "�부 아카�브를 가져오는� 실패했습니다."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
 
@@ -424,47 +424,47 @@ msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s� �미 풀려 있는 소스� 압축� 풀지 않고 건너 �니다.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "압축 풀기 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' 패키지가 설치�었는지를 확�하십시오.\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "빌드 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "하위 프로세스가 실패했습니다"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr "해당�는 빌드 �존성� 검사할 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s� 빌드 �존성 정보를 가져올 수 없습니다"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 패키지� 빌드 �존성� 없습니다.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -473,7 +473,7 @@ msgstr ""
 "%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지를 찾� 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -482,14 +482,14 @@ msgstr ""
 "%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지를 찾� 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -498,7 +498,7 @@ msgstr ""
 "%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지� 사용 가능한 버"
 "전 중�서는 � 버전 요구사항� 만족시킬 수 없습니다"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -507,30 +507,30 @@ msgstr ""
 "%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지를 찾� 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s� 대한 %1$s �존성� 만족시키는� 실패했습니다: %3$s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s� 빌드 �존성� 만족시키지 못했습니다."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "빌드 �존성� 처리하는� 실패했습니다"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s(%s)� 연결하는 중입니다"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "지�하는 모듈:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -618,16 +618,20 @@ msgstr ""
 "apt.conf(5) 매뉴얼 페�지를 보십시오.\n"
 "                       � APT는 Super Cow Powers로 무장했습니다.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "해당�는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -636,6 +640,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -665,8 +670,9 @@ msgstr "%s 패키지는 �미 최신 버전입니다.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s 패키지는 �미 최신 버전입니다.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
@@ -860,7 +866,7 @@ msgstr "소켓� 만들 수 없습니다"
 msgid "Could not connect data socket, connection timed out"
 msgstr "��터 소켓� 연결할 수 없습니다. 연결 시간� 초과�었습니다"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "실패"
 
@@ -906,7 +912,7 @@ msgstr "��터 소켓 연결 시간 초과"
 msgid "Unable to accept connection"
 msgstr "연결� 받� 수 없습니다"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "파� 해싱� 문제가 있습니다"
 
@@ -1035,91 +1041,182 @@ msgstr "다ì�Œ 서명들ì�€ 공개키가 없기 때문ì—� ì�¸ì¦�í•  수 없습ë‹
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "해당 파�� 쓰는� 오류가 발�했습니다"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "서버�서 �고 연결� 닫는� 오류가 발�했습니다"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "서버�서 �는� 오류가 발�했습니다"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "파�� 쓰는� 오류가 발�했습니다"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "select가 실패했습니다"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "연결 시간� 초과했습니다"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "출력 파�� 쓰는� 오류가 발�했습니다"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "헤�를 기다리는 중입니다"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "헤� 줄� 잘못�었습니다"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 서버�서 잘못� �답 헤�를 보냈습니다"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 서버�서 잘못� Content-Length 헤�를 보냈습니다"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 서버�서 잘못� Content-Range 헤�를 보냈습니다"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "HTTP 서버� 범위 지� 기능� 잘못�어 있습니다"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "��터 형�� 알 수 없습니다"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "헤� ��터가 잘못�었습니다"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "연결� 실패했습니다"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "내부 오류"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "기존 "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "받기:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "무시"
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "오류 "
+
+#: apt-private/acqprogress.cc:146
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "내려받기 %s바�트, 소요시간 %s (%s바�트/초)\n"
+
+#: apt-private/acqprogress.cc:236
+#, c-format
+msgid " [Working]"
+msgstr " [작업중]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"미디어 바꾸기: '%2$s' 드��브� 다� 레�블� 달린\n"
+"디스�를 넣고 enter를 누르십시오\n"
+" '%1$s'\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "경고: 다� 패키지를 ��할 수 없습니다!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "�� 경고를 무시합니다.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "��할 수 없는 패키지가 있습니다"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "확�하지 않고 패키지를 설치하시겠습니까?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "문제가 발�했고 -y 옵션� --force-yes 옵션 없� 사용�었습니다"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "%s 파�� 받는� 실패했습니다  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "내부 오류. �가진 패키지�서 InstallPackages를 호출했습니다!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "패키지를 제거해야 하지만 제거가 금지�어 있습니다."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "내부 오류. 순서변경작업� �나지 않았습니다"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "��하게� �기가 서로 다릅니다. apt@packages.debian.org로 �메�� 보내주십"
@@ -1127,42 +1224,38 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "� 작업 후 %s바�트� 디스� 공간� 비워집니다.\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s 안� 충분한 여유 공간� 없습니다."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "문제가 발�했고 -y 옵션� --force-yes 옵션 없� 사용�었습니다"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "사소한 작업만 가능하��(Trivial Only) 지정�었지만 � 작업� 사소한 작업� "
@@ -1171,11 +1264,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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1186,19 +1279,19 @@ msgstr ""
 "계�하시려면 다� 문구를 입력하십시오: '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "중단."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "계� 하시겠습니까?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "�부 파�� 받는� 실패했습니다"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1206,19 +1299,19 @@ msgstr ""
 "아카�브를 받� 수 없습니다. 아마� apt-get update를 실행해야 하거나 --fix-"
 "missing 옵션� 줘서 실행해야 할 것입니다."
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing 옵션과 �시� 미디어 바꾸기는 현재 지�하지 않습니다"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "빠진 패키지를 바로잡� 수 없습니다."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "설치를 중단합니다."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1229,15 +1322,15 @@ msgstr[0] ""
 "다� 패키지는 패키지� 파�� 모� 다른 패키지가\n"
 "�어�기 때문� 사�졌습니다:"
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "주�: dpkg�서 ��으로 ���으로 수행했습니다."
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1255,15 +1348,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "� �황� 해결하는� 다� 정보가 �움� � 수� 있습니다:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램� 무언가를 �가뜨렸습니다"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1271,14 +1364,14 @@ msgid_plural ""
 "required:"
 msgstr[0] "다� 패키지가 ��으로 설치�었지만 � �� 필요하지 않습니다:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, 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:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1297,7 +1390,7 @@ msgstr ""
 "�존성� 맞지 않습니다. 패키지 없� 'apt-get -f install'� 시�해 보십시오 "
 "(아니면 해결 방법� 지정하십시오)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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,206 +1401,189 @@ msgstr ""
 "불안정 배��� 사용해서 �부 필요한 패키지를 아� 만들지 않았거나,\n"
 "아� Incoming�서 나오지 않� 경우� 수� 있습니다."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "�가진 패키지"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "다� 패키지를 � 설치할 것입니다:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "제안하는 패키지:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "추천하는 패키지:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s 패키지를 건너 �니다. �미 설치�어 있고 업그레�드를 하지 않습니다.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s 패키지를 건너 �니다. 설치�지 않았고 업그레�드만 요청합니다.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 패키지는 �미 최신 버전입니다.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "'%3$s' 패키지� '%1$s' (%2$s) 버전� 선�합니다\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "'%3$s' 패키지� '%1$s' (%2$s) 버전� 선�합니다\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, 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."
+#: 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-get -f install'� 실행해야 할 수� 있습니다."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "�존성� 맞지 않습니다. -f 옵션� 사용해 보십시오."
+"알림: 시험 �작입니다!\n"
+"      실행하려면 apt-get� 실행할 때 루트 권한� 필요합니다.\n"
+"      � 잠금 기능� 사용하지 않는 �태�므로, 현재 �황� �존하지\n"
+"      않�� 하십시오!"
 
 #: apt-private/private-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [설치함]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [설치함]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [설치함]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [설치함]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "다� 패키지� �존성� 맞지 않습니다:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "하지만 %s 패키지를 설치했습니다"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "하지만 %s 패키지를 설치할 것입니다"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "하지만 설치할 수 없습니다"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "하지만 가� 패키지입니다"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "하지만 설치하지 않았습니다"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "하지만 %s 패키지를 설치하지 않� 것입니다"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " 혹�"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "다� 패키지� �존성� 맞지 않습니다:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "다� 새 패키지를 설치할 것입니다:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "다� 패키지를 지울 것입니다:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "다� 패키지를 과거 버전으로 유지합니다:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "다� 패키지를 업그레�드할 것입니다:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "다� 패키지를 다운그레�드할 것입니다:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "고정�었� 다� 패키지를 바꿀 것입니다:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s때문�) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1515,27 +1591,27 @@ msgstr ""
 "경고: 꼭 필요한 다� 패키지를 지우게 �니다.\n"
 "무슨 �� 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu개 업그레�드, %lu개 새로 설치, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu개 다시 설치, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu개 업그레�드, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu개 제거 � %lu개 업그레�드 안 함.\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
@@ -1544,7 +1620,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[Y/n]"
 
@@ -1552,35 +1628,28 @@ msgstr "[Y/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1593,39 +1662,6 @@ msgstr[0] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "경고: 다� 패키지를 ��할 수 없습니다!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "�� 경고를 무시합니다.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "��할 수 없는 패키지가 있습니다"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "확�하지 않고 패키지를 설치하시겠습니까?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s 파�� 받는� 실패했습니다  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1636,74 +1672,43 @@ msgstr "%s 파�� �름� %s(으)로 바꾸는� 실패했습니다"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update 명령� �수를 받지 않습니다"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "완료"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "기존 "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "받기:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "무시"
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "오류 "
-
-#: apt-private/acqprogress.cc:146
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "내려받기 %s바�트, 소요시간 %s (%s바�트/초)\n"
-
-#: apt-private/acqprogress.cc:236
-#, c-format
-msgid " [Working]"
-msgstr " [작업중]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"미디어 바꾸기: '%2$s' 드��브� 다� 레�블� 달린\n"
-"디스�를 넣고 enter를 누르십시오\n"
-" '%1$s'\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s�(를) �� 수 없습니다"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1776,36 +1781,431 @@ msgstr "오류만 중요합니다. ì�´ 오류를 고친 다ì�Œì—� 설치(I)를 ë
 msgid "Merging available information"
 msgstr "�용 가능 패키지 정보를 합칩니다"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode가 아� 연결�어 있는 노드� 대해 호출�었습니다"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "해시 항목� 찾는� 실패했습니다"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s� 정보를 �� 수 없습니다"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "diversion� 할당하는� 실패했습니다"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s� 쓸 수 없습니다"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion�서 내부 오류"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf 버전� 알 수 없습니다. debconf가 설치�었습니까?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "패키지 확장 목�� 너무 �니다"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "전환� 파�� �어 쓰려고 합니다 (%s -> %s � %s/%s)"
+msgid "Error processing directory %s"
+msgstr "%s 디렉터리를 처리하는� 오류가 발�했습니다"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "소스 확장 목�� 너무 �니다"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "컨�츠 파�� 헤�를 쓰는� 오류가 발�했습니다"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "전환� 파�� � 번 추가합니다 (%s -> %s)"
+msgid "Error processing contents %s"
+msgstr "%s 컨�츠를 처리하는� 오류가 발�했습니다"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "맞는 패키지가 없습니다"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "%s/%s 설정 파�� 중복�었습니다"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "`%s' 패키지 파� 그룹� 몇몇 파�� 빠졌습니다"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB가 �가졌습니다. 파� �름� %s.old로 바꿉니다"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB가 오래�었습니다. %s� 업그레�드를 시�합니다"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB 파�, %s 파�� 열 수 없습니다: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s� 정보를 �는� 실패했습니다"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "%s 파�� readlink하는� 실패했습니다"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "아카�브� 컨트롤 기�� 없습니다"
+
+# FIXME: 왠 커서??
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "아카�브� 패키지 필드가 없습니다"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s�는 override 항목� 없습니다\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s 관리�가 %s입니다 (%s 아님)\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s�는 source override 항목� 없습니다\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s�는 binary override 항목� 없습니다\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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� ��를 해제하는� 문제가 있습니다"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s 파�� �름� %s(으)로 바꾸는� 실패했습니다"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1831,17 +2231,6 @@ msgstr "� 패키지�서 전환� 대�� 쓰려고 합니다 (%s/%s)"
 msgid "The diversion path is too long"
 msgstr "전환하는 경로가 너무 �니다"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1870,30 +2259,36 @@ msgstr "%s/%s 파�� %s 패키지� 있는 파�� �어 �니다"
 msgid "Unable to stat %s"
 msgstr "%s� 정보를 �� 수 없습니다"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode가 아� 연결�어 있는 노드� 대해 호출�었습니다"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s 파�� 닫는� 실패했습니다"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "해시 항목� 찾는� 실패했습니다"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "diversion� 할당하는� 실패했습니다"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion�서 내부 오류"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "올바른 DEB 아카�브가 아닙니다. '%s' 멤버가 없습니다"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "전환� 파�� �어 쓰려고 합니다 (%s -> %s � %s/%s)"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "내부 오류, %s 멤버를 찾� 수 없습니다"
+msgid "Double add of diversion %s -> %s"
+msgstr "전환� 파�� � 번 추가합니다 (%s -> %s)"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "control 파�� 파싱할 수 없습니다"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "%s/%s 설정 파�� 중복�었습니다"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1941,199 +2336,52 @@ msgstr "tar 체�섬 실패, 아카�브가 ���었습니다"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "알 수 없는 TAR 헤� 타입 %u, 멤버 %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "dpkg 실행하는 중입니다"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "'%s' 패키지 시스템� 지�하지 않습니다"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "올바른 패키지 시스템 타입� 알아낼 수 없습니다"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "레코드 %i개를 �습니다.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "레코드 %i개를 파� %i개가 빠진 �태로 �습니다.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "레코드 %i개를 파� %i개가 맞지 않� �태로 �습니다\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "올바른 DEB 아카�브가 아닙니다. '%s' 멤버가 없습니다"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "레코드 %i개를 파� %i개가 빠지고 %i개가 맞지 않� �태로 �습니다\n"
+msgid "Internal error, could not locate member %s"
+msgstr "내부 오류, %s 멤버를 찾� 수 없습니다"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "다�� �� 기�� 찾� 수 없습니다: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "control 파�� 파싱할 수 없습니다"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "다�� 해시가 다릅니다: %s"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "패키지 목��나 �태 파�� 파싱할 수 없거나 열 수 없습니다."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "apt-get update를 실행하면 � 문제를 바로잡� 수� 있습니다."
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "소스 목�� �� 수 없습니다."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "패키지 �시가 비어 있습니다"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "패키지 �시 파�� ���었습니다"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "패키지 �시 파�� 호환�지 않는 버전입니다"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "패키지 �시 파�� ���었습니다"
+msgid "List directory %spartial is missing."
+msgstr "목� 디렉터리 %spartial� 빠졌습니다."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "� APT는 '%s' 버전 시스템� 지�하지 않습니다"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "패키지 �시가 다른 아키��용입니다."
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "�존"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "미리�존"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "제안"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "추천"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "충�"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "대체"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "없앰"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "�가뜨림"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "향�"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "중요"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "필수"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "표준"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "옵션"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "별�"
+msgid "Archives directory %spartial is missing."
+msgstr "아카�브 디렉터리 %spartial� 빠졌습니다."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "설치 방법 드��버 %s�(를) 찾� 수 없습니다."
+msgid "Unable to lock directory %s"
+msgstr "%s 디렉터리를 잠글 수 없습니다"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' 패키지가 설치�었는지를 확�하십시오.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "설치 방법 %s�(가) 올바르게 시작하지 않았습니다"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"'%2$s' 드��브� '%1$s'(으)로 표기� 디스�를 넣고 Enter를 누르십시오."
-
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "��스 파� 타입 '%s' 타입� 지�하지 않습니다"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "�태파� %s 여는� 실패했습니다"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "파� 받아오는 중: %2$li 중 %1$li (%3$s 남았�)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "임시 �태파� %s 쓰는� 실패했습니다"
+msgid "Retrieving file %li of %li"
+msgstr "파� 받아오는 중: %2$li 중 %1$li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2153,35 +2401,35 @@ msgstr "�기가 맞지 않습니다"
 msgid "Invalid file format"
 msgstr "잘못� 작업 %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Release 파� %s 파�� 파싱할 수 없습니다"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "다� 키 ID� 공개키가 없습니다:\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "배�� 충�: %s (예�값 %s, 실제값 %s)"
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2191,12 +2439,12 @@ msgstr ""
 "예전� ��스 파�� 사용합니다. GPG 오류: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 오류: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2205,176 +2453,123 @@ msgstr ""
 "%s 패키지� 파�� 찾� 수 없습니다. 수�으로 � 패키지를 고�야 할 수� 있습"
 "니다. (아키��가 빠졌기 때문입니다)"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "패키지 ��스 파�� ���었습니다. %s 패키지� Filename: 필드가 없습니다."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "�시� 버전 시스템� 호환�지 않습니다"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "설치 방법 드��버 %s�(를) 찾� 수 없습니다."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s 처리 중� 오류가 발�했습니다 (FindPkg)"
-
-#: 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:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "우와, � APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "우와, � APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "우와, � APT가 처리할 수 있는 �존성 개수를 넘어갔습니다."
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' 패키지가 설치�었는지를 확�하십시오.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "파� �존성� 처리하는 �, %s %s 패키지가 없습니다"
+msgid "Method %s did not start correctly"
+msgstr "설치 방법 %s�(가) 올바르게 시작하지 않았습니다"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "소스 패키지 목� %s� 정보를 �� 수 없습니다"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"'%2$s' 드��브� '%1$s'(으)로 표기� 디스�를 넣고 Enter를 누르십시오."
 
-#: 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/algorithms.cc:265
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"%s 패키지를 다시 설치해야 하지만, � 패키지� 아카�브를 찾� 수 없습니다."
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "파��서 제공하는 것� 모으는 중입니다"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"오류, pkgProblemResolver::Resolve가 �가졌습니다. 고정 패키지때문� 발�할 수"
+"� 있습니다."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s� 쓸 수 없습니다"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "문제를 바로잡� 수 없습니다. �가진 고정 패키지가 있습니다."
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "소스 �시를 저장하는� 입출력 오류가 발�했습니다"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "패키지 목��나 �태 파�� 파싱할 수 없거나 열 수 없습니다."
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "벤� 블럭 %s� 핑거프린트가 없습니다"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "apt-get update를 실행하면 � 문제를 바로잡� 수� 있습니다."
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "목� 디렉터리 %spartial� 빠졌습니다."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "소스 목�� �� 수 없습니다."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "아카�브 디렉터리 %spartial� 빠졌습니다."
+msgid "Release '%s' for '%s' was not found"
+msgstr "%2$s 패키지� '%1$s' 릴리즈를 찾� 수 없습니다"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "%s 디렉터리를 잠글 수 없습니다"
+msgid "Version '%s' for '%s' was not found"
+msgstr "%2$s 패키지� '%1$s' 버전� 찾� 수 없습니다"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "파� 받아오는 중: %2$li 중 %1$li (%3$s 남았�)"
+msgid "Couldn't find task '%s'"
+msgstr "'%s' 작업� 찾� 수 없습니다"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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 ""
-"�부 ��스 파�� 다운로드하는� 실패했습니다. 해당 파�� 무시하거나 과거"
-"� 버전� 대신 사용합니다."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "'%s' 정규�� 해당하는 패키지가 없습니다"
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "sources.list� '소스' URI를 � 넣어야 합니다"
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "'%s' 정규�� 해당하는 패키지가 없습니다"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "%s� 정보를 �� 수 없습니다."
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "'%s' 패키지는 가� 패키지�므로 버전� 선�할 수 없습니다"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
+"'%s' 패키지�서 설치한 버전�나 후보 버전� 선�할 수 없습니다. 둘 다 아닙니"
+"다."
 
-#: 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
+#: apt-pkg/cacheset.cc:647
 #, 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)를 지정하지 않았습니다"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "'%s' 패키지�서 최신 버전� 선�할 수 없습니다. 가� 패키지입니다."
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, 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:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "'%s' 파�� 열 수 없습니다"
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "'%s' 패키지�서 후보 버전� 선�할 수 없습니다. 후보가 없습니다."
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 옵션� 켜십시오."
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "'%s' 패키지�서 설치한 버전� 선�할 수 없습니다. 설치하지 않았습니다."
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2456,54 +2651,86 @@ msgstr "새 소스 리스트를 쓰는 중입니다\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "� 디스�� 소스 리스트 항목� 다�과 같습니다:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"%s 패키지를 다시 설치해야 하지만, � 패키지� 아카�브를 찾� 수 없습니다."
+msgid "Unable to stat %s."
+msgstr "%s� 정보를 �� 수 없습니다."
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"오류, pkgProblemResolver::Resolve가 �가졌습니다. 고정 패키지때문� 발�할 수"
-"� 있습니다."
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "�존성 트리를 만드는 중입니다"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-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 "Failed to open StateFile %s"
+msgstr "�태파� %s 여는� 실패했습니다"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "임시 �태파� %s 쓰는� 실패했습니다"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "패키지 파� %s 파�� 파싱할 수 없습니다 (1)"
+msgid "Wrote %i records.\n"
+msgstr "레코드 %i개를 �습니다.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "패키지 파� %s 파�� 파싱할 수 없습니다 (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "레코드 %i개를 파� %i개가 빠진 �태로 �습니다.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "레코드 %i개를 파� %i개가 맞지 않� �태로 �습니다\n"
+
+#: 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 "레코드 %i개를 파� %i개가 빠지고 %i개가 맞지 않� �태로 �습니다\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "다�� �� 기�� 찾� 수 없습니다: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "다�� 해시가 다릅니다: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2530,6 +2757,215 @@ msgstr "Release 파� %s� 'Valid-Until' 항목� 잘못�었습니다"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Release 파� %s� 'Date' 항목� 잘못�었습니다"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "'%s' 패키지 시스템� 지�하지 않습니다"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "올바른 패키지 시스템 타입� 알아낼 수 없습니다"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "dpkg 실행하는 중입니다"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "'%s' 파�� 열 수 없습니다"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "패키지 �시가 비어 있습니다"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "패키지 �시 파�� ���었습니다"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "패키지 �시 파�� 호환�지 않는 버전입니다"
+
+#: apt-pkg/pkgcache.cc:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "패키지 �시 파�� ���었습니다"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "� APT는 '%s' 버전 시스템� 지�하지 않습니다"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "패키지 �시가 다른 아키��용입니다."
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "�존"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "미리�존"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "제안"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "추천"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "충�"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "대체"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "없앰"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "�가뜨림"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "향�"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "중요"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "필수"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "표준"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "옵션"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "별�"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "우와, � APT가 처리할 수 있는 패키지 �름 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "우와, � APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "우와, � APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "우와, � APT가 처리할 수 있는 �존성 개수를 넘어갔습니다."
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "소스 패키지 목� %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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "소스 �시를 저장하는� 입출력 오류가 발�했습니다"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "��스 파� 타입 '%s' 타입� 지�하지 않습니다"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2606,232 +3042,143 @@ msgstr "소스 목ë¡� %3$sì�˜ %2$u번 줄ì�˜ '%1$s' 타입ì�„ ì•Œ 수 없습니ë
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "소스 목� %3$s� %2$u번 줄� '%1$s' 타입� 알 수 없습니다"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "%2$s 패키지� '%1$s' 릴리즈를 찾� 수 없습니다"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "%2$s 패키지� '%1$s' 버전� 찾� 수 없습니다"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "'%s' 작업� 찾� 수 없습니다"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "sources.list� '소스' URI를 � 넣어야 합니다"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "'%s' 정규�� 해당하는 패키지가 없습니다"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "'%s' 정규�� 해당하는 패키지가 없습니다"
+msgid "Unable to parse package file %s (1)"
+msgstr "패키지 파� %s 파�� 파싱할 수 없습니다 (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "'%s' 패키지는 가� 패키지�므로 버전� 선�할 수 없습니다"
+msgid "Unable to parse package file %s (2)"
+msgstr "패키지 파� %s 파�� 파싱할 수 없습니다 (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"'%s' 패키지�서 설치한 버전�나 후보 버전� 선�할 수 없습니다. 둘 다 아닙니"
-"다."
+"�부 ��스 파�� 다운로드하는� 실패했습니다. 해당 파�� 무시하거나 과거"
+"� 버전� 대신 사용합니다."
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "'%s' 패키지�서 최신 버전� 선�할 수 없습니다. 가� 패키지입니다."
+msgid "Vendor block %s contains no fingerprint"
+msgstr "벤� 블럭 %s� 핑거프린트가 없습니다"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "'%s' 패키지�서 후보 버전� 선�할 수 없습니다. 후보가 없습니다."
+msgid "Unable to stat the mount point %s"
+msgstr "마운트 위치 %s� 정보를 �� 수 없습니다"
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "CD-ROM� 정보를 �� 수 없습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "%s 설치하는 중입니다"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "명령행 옵션 '%c' 옵션� [%s�서] 알 수 없습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "%s 설정 중입니다"
+msgid "Command line option %s is not understood"
+msgstr "명령행 옵션 '%s' 옵션� 알 수 없습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "%s 패키지를 지우는 중입니다"
+msgid "Command line option %s is not boolean"
+msgstr "명령행 옵션 '%s' 옵션� 불리언� 아닙니다"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "%s 패키지를 완전히 지우는 중입니다"
+msgid "Option %s requires an argument."
+msgstr "%s 옵션�는 �수가 필요합니다."
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "%s 사�� 발견했습니다"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "%s 옵션: 설정 항목 지정� =<값> 형태여야 합니다."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "설치 후 트리거 %s 실행하는 중입니다"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "%s 옵션�는 정수 �수가 필요합니다. '%s'�(가) 아닙니다"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "디렉터리 '%s' 없습니다."
+msgid "Option '%s' is too long"
+msgstr "'%s' 옵션� 너무 �니다"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "'%s' 파�� 열 수 없습니다"
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s 센스를 �해할 수 없습니다. 참 아니면 거짓으로 해 보십시오."
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "%s 준비 중입니다"
+msgid "Invalid operation %s"
+msgstr "잘못� 작업 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "%s 푸는 중입니다"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "� 타입 줄임�� 알 수 없습니다: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "%s 패키지를 설정할 준비하는 중입니다"
+msgid "Opening configuration file %s"
+msgstr "설정 파� %s 파�� 여는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "%s 설치"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "문법 오류 %s:%u: 블럭� �름으로 시작하지 않습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s 패키지를 지울 준비하는 중입니다"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "문법 오류 %s:%u: 태그� 형�� 잘못�었습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "%s 지움"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "문법 오류 %s:%u: 값 뒤� 쓰레기 ��터가 � 있습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계�서만 쓸 수 있습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s 패키지를 완전히 지웠습니다"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "�존성 문제 - 설정하지 않� �태로 남겨둡니다"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"보고서를 작성하지 않습니다. 오류 메시지� 따르면 예전� 실패 때문� �긴 부수"
-"�� 오류입니다."
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"보고서를 작성하지 않습니다. 오류 메시지� 따르면 디스�가 가� 찼습니다."
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr "보고서를 작성하지 않습니다. 오류 메시지� 따르면 메모리가 부족합니다."
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"보고서를 작성하지 않습니다. 오류 메시지� 따르면 디스�가 가� 찼습니다."
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"보고서를 작성하지 않습니다. 오류 메시지� 따르면 dpkg 입출력 오류입니다."
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "문법 오류 %s:%u: include가 너무 많� 겹� 있습니다"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니"
-"까?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "문법 오류 %s:%u: 여기서 include�니다"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용�가 맞습니까?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "문법 오류 %s:%u: 지�하지 않는 지시어 '%s'"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg가 중단�었습니다. 수�으로 '%s' 명령� 실행해 문제�� 바로잡으십시오."
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "문법 오류 %s:%u: clear 지시어는 �수로 option 트리를 지정해야 합니다"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "잠기지 않�"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "문법 오류 %s:%u: 파�� �� 쓰레기 ��터가 � 있습니다"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2946,54 +3293,11 @@ msgstr "%s 파�� 삭제하는� 문제가 있습니다"
 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... 완료"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "선�한 %s�(가) 없습니다"
+msgid "No keyring installed in %s."
+msgstr "%s� 키 모�� 설치하지 않았습니다."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3048,521 +3352,228 @@ msgid ""
 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "No keyring installed in %s."
-msgstr "%s� 키 모�� 설치하지 않았습니다."
+msgid "%c%s... Error!"
+msgstr "%c%s... 오류!"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "명령행 옵션 '%c' 옵션� [%s�서] 알 수 없습니다."
+msgid "%c%s... Done"
+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/progress.cc:181
+msgid "..."
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:168
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "명령행 옵션 '%s' 옵션� 불리언� 아닙니다"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... 완료"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "%s 옵션�는 �수가 필요합니다."
+msgid "%lid %lih %limin %lis"
+msgstr "%li� %li시간 %li분 %li초"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "%s 옵션: 설정 항목 지정� =<값> 형태여야 합니다."
+msgid "%lih %limin %lis"
+msgstr "%li시간 %li분 %li초"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "%s 옵션�는 정수 �수가 필요합니다. '%s'�(가) 아닙니다"
+msgid "%limin %lis"
+msgstr "%li분 %li초"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "'%s' 옵션� 너무 �니다"
+msgid "%lis"
+msgstr "%liì´ˆ"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s 센스를 �해할 수 없습니다. 참 아니면 거짓으로 해 보십시오."
+msgid "Selection %s not found"
+msgstr "선�한 %s�(가) 없습니다"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "패키지 확장 목�� 너무 �니다"
+"관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니"
+"까?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "%s 디렉터리를 처리하는� 오류가 발�했습니다"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "소스 확장 목�� 너무 �니다"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "컨�츠 파�� 헤�를 쓰는� 오류가 발�했습니다"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용�가 맞습니까?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "%s 컨�츠를 처리하는� 오류가 발�했습니다"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "맞는 패키지가 없습니다"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "`%s' 패키지 파� 그룹� 몇몇 파�� 빠졌습니다"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB가 �가졌습니다. 파� �름� %s.old로 바꿉니다"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB가 오래�었습니다. %s� 업그레�드를 시�합니다"
+"dpkg가 중단�었습니다. 수�으로 '%s' 명령� 실행해 문제�� 바로잡으십시오."
 
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB 형�� 잘못�었습니다. APT 예전 버전�서 업그레�드했다면, ��터베�스를 "
-"지우고 다시 만드십시오."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "잠기지 않�"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "DB 파�, %s 파�� 열 수 없습니다: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s 파�� readlink하는� 실패했습니다"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "아카�브� 컨트롤 기�� 없습니다"
-
-# FIXME: 왠 커서??
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "커서를 가져올 수 없습니다"
+msgid "Installing %s"
+msgstr "%s 설치하는 중입니다"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "경고: %s 디렉터리를 �� 수 없습니다\n"
+msgid "Configuring %s"
+msgstr "%s 설정 중입니다"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, 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 "오류: 다� 파�� �용하는� 오류가 발�했습니다: "
+msgid "Removing %s"
+msgstr "%s 패키지를 지우는 중입니다"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "%s� 경로를 알아내는� 실패했습니다"
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "트리�서 ��� 실패했습니다"
+msgid "Completely removing %s"
+msgstr "%s 패키지를 완전히 지우는 중입니다"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s 파�� 여는� 실패했습니다"
+msgid "Noting disappearance of %s"
+msgstr "%s 사�� 발견했습니다"
 
-# FIXME: ??
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " �� %s [%s] 없애기\n"
+msgid "Running post-installation trigger %s"
+msgstr "설치 후 트리거 %s 실행하는 중입니다"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "%s 파�� readlink하는� 실패했습니다"
+msgid "Directory '%s' missing"
+msgstr "디렉터리 '%s' 없습니다."
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "%s 파�� 지우는� 실패했습니다"
+msgid "Could not open file '%s'"
+msgstr "'%s' 파�� 열 수 없습니다"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s 파�� %s� ��하는� 실패했습니다"
+msgid "Preparing %s"
+msgstr "%s 준비 중입니다"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink 한계값 %s바�트� �달했습니다.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "아카�브� 패키지 필드가 없습니다"
+msgid "Unpacking %s"
+msgstr "%s 푸는 중입니다"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s�는 override 항목� 없습니다\n"
+msgid "Preparing to configure %s"
+msgstr "%s 패키지를 설정할 준비하는 중입니다"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 관리�가 %s입니다 (%s 아님)\n"
+msgid "Installed %s"
+msgstr "%s 설치"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s�는 source override 항목� 없습니다\n"
+msgid "Preparing for removal of %s"
+msgstr "%s 패키지를 지울 준비하는 중입니다"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s�는 binary override 항목� 없습니다\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 메모리를 할당하는� 실패했습니다"
+msgid "Removed %s"
+msgstr "%s 지움"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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� 잘못�었습니다"
+msgid "Preparing to completely remove %s"
+msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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가 잘못�었습니다"
+msgid "Completely removed %s"
+msgstr "%s 패키지를 완전히 지웠습니다"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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' 압축 알고리즘� 알 수 없습니다"
+msgid "Can not write log (%s)"
+msgstr "%s� 쓸 수 없습니다"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "압축� 출력물 %s�는 압축 세트가 필요합니다"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE*를 만드는� 실패했습니다"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork하는� 실패했습니다"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "압축 하위 프로세스"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "보고서를 작성하지 않습니다. �미 MaxReports 값� �달했습니다."
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "내부 오류, %s 만드는� 실패했습니다"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "�존성 문제 - 설정하지 않� �태로 남겨둡니다"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "하위 프로세스/파�� 입출력하는� 실패했습니다"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"보고서를 작성하지 않습니다. 오류 메시지� 따르면 예전� 실패 때문� �긴 부수"
+"�� 오류입니다."
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5를 계산하는 �안 �는� 실패했습니다"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"보고서를 작성하지 않습니다. 오류 메시지� 따르면 디스�가 가� 찼습니다."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s� ��를 해제하는� 문제가 있습니다"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr "보고서를 작성하지 않습니다. 오류 메시지� 따르면 메모리가 부족합니다."
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 #, 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 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
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"보고서를 작성하지 않습니다. 오류 메시지� 따르면 dpkg 입출력 오류입니다."
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "내부 오류, AllUpgrade 프로그램� 무언가를 �가뜨렸습니다"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s�(는) 올바른 DEB 패키지가 아닙니다."
diff --git a/po/ku.po b/po/ku.po
index a5fbbbd89..5f5512065 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-ku\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
-"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
+"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
-"Language: \n"
+"Language: ku\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,75 +101,75 @@ msgstr "Cihê giştî yê veqetandî: "
 msgid "Package file %s is out of sync."
 msgstr "Pakêta dosya %s li derveyî demê ye."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Pêwist e tu mînakekê bidî"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Pakêt nehate dîtin %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Pelgehên Pakêt:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(nehate dîtin)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Sazkirî: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Berendam: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ne tiÅŸtek)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Destika pakêtê:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Tabloya guhertoyan:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -295,7 +295,7 @@ msgid "Couldn't find package %s"
 msgstr "Nikarî pakêta %s bibîne"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "lê %s dê were sazkirin"
@@ -323,7 +323,7 @@ msgstr "Pelrêça daxistinê nayê quflekirin"
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
@@ -349,7 +349,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nikarî cihê vala li %s tesbît bike"
@@ -382,7 +382,7 @@ msgstr "Çavkanîna %s bîne\n"
 msgid "Failed to fetch some archives."
 msgstr "Anîna çend arşîvan biserneket."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr ""
 
@@ -391,103 +391,103 @@ msgstr ""
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, 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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Girêdan bi %s (%s) re pêk tê"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -533,15 +533,19 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -550,6 +554,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -579,8 +584,9 @@ msgstr "%s jixwe guhertoya nûtirîn e.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -771,7 +777,7 @@ msgstr ""
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Serneket"
 
@@ -817,7 +823,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr ""
 
@@ -947,143 +953,226 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Hilbijartin neserketî"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 #, fuzzy
 msgid "Error writing to output file"
 msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr ""
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Girêdan pêk nehatiye"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr ""
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Anîn:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr ""
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Çewt"
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Dixebite]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Bindestî tên serrastkirin..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " neserketî."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nikare bindestiyan rast kirin"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Temam"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+
+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Anîna %s %s biserneket\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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
+#: apt-private/private-install.cc:160
 #, 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
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\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
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Cihê vala li %s têre nake."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Erê, wusa bike!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1091,37 +1180,37 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Betal."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Dixwazî bidomînî?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Daxistina çend pelan biserneket"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Sazkirin tê betalkirin."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1131,15 +1220,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1155,15 +1244,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1173,7 +1262,7 @@ msgid_plural ""
 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
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1181,7 +1270,7 @@ msgid_plural ""
 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
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
@@ -1197,7 +1286,7 @@ msgid ""
 "solution)."
 msgstr ""
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1205,68 +1294,68 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Paketên şikestî"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Paketên tên pêşniyaz kirin:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Paketên tên tawsiyê kirin:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1274,32 +1363,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Bindestî tên serrastkirin..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " neserketî."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nikare bindestiyan rast kirin"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Temam"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
+#: 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-output.cc:103 apt-private/private-show.cc:84
@@ -1307,129 +1376,129 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Sazkirî]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Sazkirî]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Sazkirî]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Sazkirî]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "lê %s sazkirî ye"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "lê %s dê were sazkirin"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "lê sazkirina wê ne gengaz e"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "lê paketeke farazî ye"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "lê ne sazkirî ye"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "lê dê neyê sazkirin"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " û"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Ev pakêt dê werine RAKIRIN:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Ev paket dê werine bilindkirin:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (ji ber %s)"
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ji nû ve sazkirî,"
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu hatine nizmkirin."
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
@@ -1438,7 +1507,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:728
+#: apt-private/private-output.cc:761
 #, fuzzy
 msgid "[Y/n]"
 msgstr "[E/n]"
@@ -1447,37 +1516,29 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "E"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
 #: apt-private/private-show.cc:156
 #, c-format
 msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1490,35 +1551,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr ""
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr ""
-
-#: apt-private/private-download.cc:91 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? "
@@ -1529,70 +1561,44 @@ msgstr "%s ji hev nehate veçirandin"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
 msgid "Calculating upgrade... "
 msgstr "Bilindkirin tê hesibandin..."
 
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr ""
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Temam"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr ""
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Anîn:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr ""
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Çewt"
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Dixebite]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nikare %s bixwîne"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1664,365 +1670,548 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: 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-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-inst/filelist.cc:459
-#, fuzzy
-msgid "Failed to allocate diversion"
-msgstr "%s venebû"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
+msgid "Error processing directory %s"
+msgstr "Di şixulandina pêrista %s de çewtî"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Dema şixulandina naveroka %s çewtî"
+
+#: ftparchive/apt-ftparchive.cc:626
+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-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:822
+msgid "No selections matched"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
+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:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide"
+
+#: ftparchive/cachedb.cc:94
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/cachedb.cc:99
 #, c-format
-msgid "The path %s is too long"
-msgstr "Rêça %s zêde dirêj e"
+msgid "Unable to open DB file %s: %s"
+msgstr "Danegira %s nehate vekirin: %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
-msgid "Unpacking %s more than once"
+msgid "Failed to stat %s"
 msgstr ""
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Rakirina %s biserneket"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Tomara kontrola arşîvê tuneye"
+
+#: ftparchive/cachedb.cc:594
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "The directory %s is diverted"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: pelrêça %s nayê xwendin\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:152
+#: 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 "The package is trying to write to the diversion target %s/%s"
+msgid "Failed to resolve %s"
+msgstr "%s ji hev nehate veçirandin"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
 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:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s venebû"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/writer.cc:278
 #, c-format
-msgid "Failed to stat %s"
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/writer.cc:286
 #, c-format
-msgid "Failed to rename %s to %s"
+msgid "Failed to readlink %s"
 msgstr ""
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:290
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid "Failed to unlink %s"
 msgstr ""
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Rêç zêde dirêj e"
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr ""
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:417
+msgid "Archive had no package field"
+msgstr "Di arşîvê de qada pakêtê tuneye"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
 #, c-format
-msgid "Overwrite package match with no version for %s"
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:498
-#, fuzzy, c-format
-msgid "Unable to stat %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr ""
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:710
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Nivîsîna pelê %s biserneket"
+msgid "  %s has no binary override entry either\n"
+msgstr ""
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr ""
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Girtina pelê %s biserneket"
+msgid "Unable to open %s"
+msgstr "%s venebû"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
-msgid "Internal error, could not locate member %s"
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:73
 #, c-format
-msgid "Invalid archive member header %s"
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arşîv zêde kin e"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr ""
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:124
-#, fuzzy
-msgid "Failed to create pipes"
-msgstr "%s ji hev nehate veçirandin"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Xebitandina gzip biserneket"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:359
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
+msgid "Problem unlinking %s"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:57
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
+#: cmdline/apt-internal-solver.cc:49
+#, 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 ""
+"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/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
 msgstr ""
 
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
+#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i tomar hatin nivîsîn.\n"
+msgid "Failed to write file %s"
+msgstr "Nivîsîna pelê %s biserneket"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-inst/dirstream.cc:105
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+msgid "Failed to close file %s"
+msgstr "Girtina pelê %s biserneket"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "The path %s is too long"
+msgstr "Rêça %s zêde dirêj e"
+
+#: apt-inst/extract.cc:132
+#, c-format
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash Sum li hev nayên"
+#: 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"
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-inst/extract.cc:249
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Rêç zêde dirêj e"
+
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
+#: apt-inst/extract.cc:438
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
+#: apt-inst/extract.cc:498
+#, fuzzy, c-format
+msgid "Unable to stat %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
+
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
+#: apt-inst/filelist.cc:459
+#, fuzzy
+msgid "Failed to allocate diversion"
+msgstr "%s venebû"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Bindest"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "PêşBindest"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Pêşniyaz dike"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Tawsiye dike"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Nakokî"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Dikeve ÅŸunve"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Kevin dike"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Dişkîne"
+#: apt-inst/contrib/arfile.cc:96
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "girîng"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arşîv zêde kin e"
 
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "pêwist"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standard"
+#: apt-inst/contrib/extracttar.cc:124
+#, fuzzy
+msgid "Failed to create pipes"
+msgstr "%s ji hev nehate veçirandin"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opsiyonel"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Xebitandina gzip biserneket"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "ekstra"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr ""
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Is the package %s installed?"
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: 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-pkg/pkgrecords.cc:38
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Guhartoyên berendam"
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."
+msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr ""
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "W: pelrêça %s nayê xwendin\n"
+
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, c-format
+msgid "Clean of %s is not supported"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Vekirina StateFile %s biserneket"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s ji hev nehate veçirandin"
+#: apt-pkg/acquire.cc:904
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Pel tê anîn %li ji %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2041,35 +2230,35 @@ msgstr "Mezinahî li hev nayên"
 msgid "Invalid file format"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2077,178 +2266,127 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
 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: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."
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: 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-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/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 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 "Lîsteya pakêtan tê xwendin"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, c-format
-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"
+msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
+msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Peldanka '%s' kêm e"
+msgid "Couldn't find task '%s'"
+msgstr "Peywira %s nehate dîtin"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Peldanka '%s' kêm e"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nikarî pakêta %s bibîne"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "W: pelrêça %s nayê xwendin\n"
-
-#. 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 ""
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nikarî pakêta %s bibîne"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Pel tê anîn %li ji %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"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/clean.cc:61
-#, fuzzy, c-format
-msgid "Unable to stat %s."
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, 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"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Did not understand pin type %s"
-msgstr ""
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nikarî pelê %s veke"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
@@ -2329,51 +2467,86 @@ msgstr ""
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:265
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+#: apt-pkg/clean.cc:64
+#, fuzzy, c-format
+msgid "Unable to stat %s."
+msgstr "Nivîsandin ji bo %s ne pêkane"
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Guhartoyên berendam"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Vekirina StateFile %s biserneket"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s ji hev nehate veçirandin"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "%i tomar hatin nivîsîn.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Pakêt nehate dîtin %s"
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum li hev nayên"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2400,6 +2573,209 @@ msgstr ""
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Pakêt nehate dîtin %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr ""
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nikarî pelê %s veke"
+
+#: apt-pkg/packagemanager.cc:630
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Bindest"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "PêşBindest"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Pêşniyaz dike"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Tawsiye dike"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Nakokî"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Dikeve ÅŸunve"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Kevin dike"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Dişkîne"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "girîng"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "pêwist"
+
+#: 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/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: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/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %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 "Lîsteya pakêtan tê xwendin"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr ""
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr ""
+
 #: apt-pkg/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2475,220 +2851,139 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: 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"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
 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
+#: apt-pkg/tagfile.cc:140
 #, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nikarî pakêta %s bibîne"
+msgid "Unable to parse package file %s (1)"
+msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/tagfile.cc:237
 #, 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 ""
+msgid "Unable to parse package file %s (2)"
+msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 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"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "%s hatine sazkirin"
-
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
-#, c-format
-msgid "Configuring %s"
-msgstr "%s tê mîhengkirin"
-
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
-#, c-format
-msgid "Removing %s"
-msgstr "%s tê rakirin"
-
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cdromutl.cc:65
 #, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s bi tevahî hatine rakirin"
+msgid "Unable to stat the mount point %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-pkg/deb/dpkgpm.cc:99
-#, c-format
-msgid "Noting disappearance of %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#. 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/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Nikarî pelê %s veke"
-
-#: apt-pkg/deb/dpkgpm.cc:989
-#, c-format
-msgid "Preparing %s"
-msgstr "%s tê amadekirin"
-
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Unpacking %s"
-msgstr "%s tê derxistin"
+msgid "Command line option %s is not understood"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Mîhengkirina %s tê amadekirin"
+msgid "Command line option %s is not boolean"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Installed %s"
-msgstr "%s hatine sazkirin"
+msgid "Option %s requires an argument."
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Rakirina %s tê amadekirin"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Removed %s"
-msgstr "%s hatine rakirin"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Bi tevahî rakirina %s tê amadekirin"
+msgid "Option '%s' is too long"
+msgstr "Opsiyona '%s' zêde dirêj e"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s bi tevahî hatine rakirin"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-pkg/deb/dpkgpm.cc:1069
-msgid "Is /dev/pts mounted?"
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
 msgstr ""
 
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: 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
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:190
@@ -2804,54 +3099,11 @@ msgstr "Di girtina pelî de pirsgirêkek derket"
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Çewtî!"
-
-#: apt-pkg/contrib/progress.cc:150
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Çêbû"
-
-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Çêbû"
-
-#. 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 "Hilbijartina %s nehatiye dîtin"
+msgid "No keyring installed in %s."
+msgstr "Sazkirin tê betalkirin."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -2906,458 +3158,214 @@ msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
-#: 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/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 ""
-
-#: apt-pkg/contrib/configuration.cc:633
-#, c-format
-msgid "Opening configuration file %s"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:801
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:820
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:837
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr ""
+msgid "%c%s... Error!"
+msgstr "%c%s... Çewtî!"
 
-#: apt-pkg/contrib/configuration.cc:900
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
+msgid "%c%s... Done"
+msgstr "%c%s... Çêbû"
 
-#: apt-pkg/contrib/configuration.cc:950
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Sazkirin tê betalkirin."
-
-#: apt-pkg/contrib/cmndline.cc:121
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr ""
-
-#: 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 ""
+msgid "%c%s... %u%%"
+msgstr "%c%s... Çêbû"
 
-#: apt-pkg/contrib/cmndline.cc:168
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s requires an argument."
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+msgid "%lis"
 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/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr ""
+msgid "Selection %s not found"
+msgstr "Hilbijartina %s nehatiye dîtin"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Invalid operation %s"
-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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:254
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Di şixulandina pêrista %s de çewtî"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Dema şixulandina naveroka %s çewtî"
-
-#: ftparchive/apt-ftparchive.cc:626
-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:841
-msgid "No selections matched"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Pelrêça daxistinê nayê quflekirin"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide"
-
-#: ftparchive/cachedb.cc:94
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Danegira %s nehate vekirin: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Rakirina %s biserneket"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Tomara kontrola arşîvê tuneye"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr ""
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: pelrêça %s nayê xwendin\n"
-
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: 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 "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s ji hev nehate veçirandin"
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s venebû"
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "%s hatine sazkirin"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr ""
-
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr ""
+msgid "Configuring %s"
+msgstr "%s tê mîhengkirin"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to unlink %s"
-msgstr ""
+msgid "Removing %s"
+msgstr "%s tê rakirin"
 
-#: ftparchive/writer.cc:298
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s bi tevahî hatine rakirin"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Di arşîvê de qada pakêtê tuneye"
-
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr ""
+msgid "Directory '%s' missing"
+msgstr "Peldanka '%s' kêm e"
 
-#: ftparchive/writer.cc:706
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Nikarî pelê %s veke"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr ""
+msgid "Preparing %s"
+msgstr "%s tê amadekirin"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s venebû"
+msgid "Unpacking %s"
+msgstr "%s tê derxistin"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr ""
+msgid "Preparing to configure %s"
+msgstr "Mîhengkirina %s tê amadekirin"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr ""
+msgid "Installed %s"
+msgstr "%s hatine sazkirin"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgid "Preparing for removal of %s"
+msgstr "Rakirina %s tê amadekirin"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgid "Removed %s"
+msgstr "%s hatine rakirin"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "Bi tevahî rakirina %s tê amadekirin"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "%s bi tevahî hatine rakirin"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
 msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
 #~ msgid "%s not a valid DEB package."
diff --git a/po/lt.po b/po/lt.po
index 75ad93793..2f6d71365 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -16,6 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2008-08-02 05:04+0000\n"
 
 #: cmdline/apt-cache.cc:149
@@ -100,74 +102,74 @@ msgstr ""
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Paketų failai:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Surišti paketai:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(nerasta)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Įdiegta: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Kandidatas: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(nÄ—ra)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Paketo susiejimai: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Versijų lentelė:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -292,7 +294,7 @@ msgid "Couldn't find package %s"
 msgstr "Nepavyko rasti paketo %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
@@ -320,7 +322,7 @@ msgstr "Nepavyko užrakinti parsiuntimų aplanko"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
@@ -346,7 +348,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nepavyko nustatyti %s laisvos vietos"
@@ -379,7 +381,7 @@ msgstr "Parsiun�iamas archyvas %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Nepavyko gauti kai kurių arhcyvų."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Pavyko parsiųsti tik parsiuntimo režime"
 
@@ -388,47 +390,47 @@ msgstr "Pavyko parsiųsti tik parsiuntimo režime"
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Jau išpakuotas archyvas %s praleidžiama\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Klaida procese-palikuonyje"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -436,7 +438,7 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -444,14 +446,14 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -460,7 +462,7 @@ msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
 "versijos %s paketo"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -468,30 +470,30 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nepavyko patenkinti %s priklausomybÄ—s %s: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Jungiamasi prie %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Palaikomi moduliai:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -537,16 +539,20 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -555,6 +561,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -584,8 +591,9 @@ msgstr "%s ir taip jau yra naujausias.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -775,7 +783,7 @@ msgstr ""
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Nepavyko"
 
@@ -821,7 +829,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr ""
 
@@ -949,142 +957,229 @@ msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Klaida bandant rašyti į failą"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Prisijungimo laiko limitas baigÄ—si"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Laukiama antraš�ių"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr ""
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "VidinÄ— klaida"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Imamas "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Gauti:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ignoruotas "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Klaida "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Vykdoma]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Laikmenos keitimas: įdėkite diską, pažymėtą\n"
+" „%s“,\n"
+"į įrenginį „%s“ ir paspauskite enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Nepavyko autentikuoti kai kurių paketų"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Įdiegti šiuos paketus be patvirtinimo?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Nepavyko parsiųsti %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s nÄ—ra pakankamai laisvos vietos."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Taip, daryk kaip liepiu!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1095,19 +1190,19 @@ msgstr ""
 "Jei norite tęsti, įveskite frazę „%s“\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Nutraukti."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Ar norite tęsti?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Nepavyko parsiųsti kai kurių failų"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1115,19 +1210,19 @@ msgstr ""
 "Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ "
 "arba pabandykite su parametru --fix-missing?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Nepavyko pataisyti dingusių paketų."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Diegimas nutraukiamas."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1137,15 +1232,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1161,15 +1256,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1179,7 +1274,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:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1187,7 +1282,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:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1206,7 +1301,7 @@ msgstr ""
 "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
 "nurodytų paketų (arba nurodykite išeitį)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1218,70 +1313,70 @@ msgstr ""
 "leidimÄ…, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
 "pašalinti iš \"Incoming\" aplanko."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Sugadinti paketai"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Bus įdiegti šie papildomi paketai:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Siūlomi paketai:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Rekomenduojami paketai:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Pažymėta versija %s (%s) paketui %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Pažymėta versija %s (%s) paketui %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1289,137 +1384,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Įdiegtas]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Įdiegtas]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Įdiegtas]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Įdiegtas]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Šie paketai turi neįdiegtų priklausomybių:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "bet %s yra įdiegtas"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "bet %s bus įdiegtas"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ta�iau jis negali būti įdiegtas"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "bet tai yra virtualus paketas"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "bet jis nėra įdiegtas"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "bet jis nebus įdiegtas"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " arba"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Šie paketai turi neįdiegtų priklausomybių:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Bus įdiegti šie NAUJI paketai:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Bus PAÅ ALINTI Å¡ie paketai:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Šių paketų atnaujinimas sulaikomas:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Bus atnaujinti Å¡ie paketai:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Bus PAKEISTI SENESNIAIS Å¡ie paketai:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Bus pakeisti Å¡ie sulaikyti paketai:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (dÄ—l %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1427,27 +1501,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu atnaujinti, %lu naujai įdiegti, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu įdiegti iš naujo, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu pasendinti, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
@@ -1456,7 +1530,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[T/n]"
 
@@ -1464,36 +1538,28 @@ msgstr "[T/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "T"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1507,35 +1573,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Nepavyko autentikuoti kai kurių paketų"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Įdiegti šiuos paketus be patvirtinimo?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Nepavyko parsiųsti %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1546,74 +1583,44 @@ msgstr "Nepavyko pervadinti %s į %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Atnaujinimo komandai argumentų nereikia"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Įvykdyta"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Imamas "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Gauti:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ignoruotas "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Klaida "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Vykdoma]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Laikmenos keitimas: įdėkite diską, pažymėtą\n"
-" „%s“,\n"
-"į įrenginį „%s“ ir paspauskite enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nepavyko perskaityti %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1691,35 +1698,436 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sujungiama turima informaija"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: 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"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nepavyko sukurti %s"
+
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nepavyko įrašyti į %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:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Paketo plėtinių sąrašas yra per ilgas"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Klaida apdorojant aplankÄ… %s"
+
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Å altinio plÄ—tinys yra per ilgas"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Klaida įrašant antraštę į turinio failą"
+
+#: ftparchive/apt-ftparchive.cc:431
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Klaida apdorojant turinį %s"
+
+#: ftparchive/apt-ftparchive.cc:626
+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ą"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
+#: ftparchive/apt-ftparchive.cc:822
+msgid "No selections matched"
+msgstr "Nėra atitikmenų"
+
+#: ftparchive/apt-ftparchive.cc:907
+#, 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:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s"
+
+#: ftparchive/cachedb.cc:94
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
+"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės "
+"versijos, prašome pašalinkite ir perkurkite duomenų bazę."
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: ftparchive/cachedb.cc:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Nepavyko patikrinti %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Nepavyko nuskaityti nuorodos %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
+#: ftparchive/cachedb.cc:594
+msgid "Unable to get a cursor"
 msgstr ""
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "W: Unable to read directory %s\n"
+msgstr "Ä®: Nepavyko perskaityti aplanko %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "Ä®: Nepavyko patikrinti %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "K: "
+
+#: 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 "Failed to resolve %s"
+msgstr "Nepavyko išspręsti %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Judesys medyje nepavyko"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Nepavyko atverti %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/writer.cc:286
 #, c-format
-msgid "Double add of diversion %s -> %s"
+msgid "Failed to readlink %s"
+msgstr "Nepavyko nuskaityti nuorodos %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Nepavyko atsieti nuorodos %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Nepavyko susieti %s su %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/writer.cc:417
+msgid "Archive had no package field"
+msgstr "Archyvas neturÄ—jo paketo lauko"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
 #, c-format
-msgid "Duplicate conf file %s/%s"
+msgid "  %s has no override entry\n"
+msgstr "  %s neturi perrašymo įrašo\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s prižiūrėtojas yra %s, o ne %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nepavyko išskirti atminties"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+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"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nepavyko nuskaityti perrašymo failo %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Nežinomas suspaudimo algoritmas „%s“"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Suspaustai išves�iai %s reikia suspaudimo rinkinio"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Nepavyko sukurti 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 "VidinÄ— klaida, nepavyko sukurti  %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Nepavyko Nusk/Įraš į subprocesą/failą"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Skaitymo klaida skai�iuojant MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nepavyko pervadinti %s į %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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 ""
+"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!"
+
+#: 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/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
 msgstr ""
 
 #: apt-inst/extract.cc:101 apt-inst/extract.cc:172
@@ -1746,17 +2154,6 @@ msgstr ""
 msgid "The diversion path is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Nepavyko patikrinti %s"
-
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Nepavyko pervadinti %s į %s"
-
 #: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
@@ -1785,29 +2182,35 @@ msgstr ""
 msgid "Unable to stat %s"
 msgstr ""
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
-#, c-format
-msgid "Failed to write file %s"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr ""
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr ""
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "VidinÄ— klaida, nepavyko aptikti nario %s"
+msgid "Double add of diversion %s -> %s"
+msgstr ""
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
 msgstr ""
 
 #: apt-inst/contrib/arfile.cc:76
@@ -1856,199 +2259,52 @@ msgstr "Tar kontrolinÄ— suma klaidinga, archyvas sugadintas"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Nežinomas TAR antraštės tipas %u. narys %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
+msgid "Internal error, could not locate member %s"
+msgstr "VidinÄ— klaida, nepavyko aptikti nario %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Maišos sumos nesutapimas"
-
-#: 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-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-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-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:174
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Priklauso"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Priešpriklauso"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Siūlo"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Rekomenduoja"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Konfliktuoja"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Pakei�ia"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Pakei�ia"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Sugadina"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "Svarbu"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "privaloma"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standartinis"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "nebūtinas"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "papildomas"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
+msgid "List directory %spartial is missing."
+msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:91
 #, 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 "Method %s did not start correctly"
-msgstr ""
+msgid "Archives directory %spartial is missing."
+msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter."
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Nepavyko užrakinti sąrašo aplanko"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Konstruojamas priklausomybių medis"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Galimos versijos"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Priklausomybių generavimas"
-
-#: 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:250
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Parsiun�iamas %li failas iš %li (liko %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgid "Retrieving file %li of %li"
+msgstr "Parsiun�iamas %li failas iš %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2068,35 +2324,35 @@ msgstr "Neatitinka dydžiai"
 msgid "Invalid file format"
 msgstr "Klaidingas veiksmas %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2104,181 +2360,129 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG klaida: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
 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: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
+#: apt-pkg/acquire-worker.cc:118
 #, 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 ""
+msgid "Is the package %s installed?"
+msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: 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/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 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 "Skaitomi paketų sąrašai"
+#: 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-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+#: 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-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nepavyko įrašyti į %s"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Nepavyko perskaityti šaltinių sąrašo."
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr ""
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr ""
+msgid "Version '%s' for '%s' was not found"
+msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Trūksta aplanko „%s“"
+msgid "Couldn't find task '%s'"
+msgstr "Nepavyko rasti užduoties %s"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Trūksta aplanko „%s“"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nepavyko rasti paketo %s"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nepavyko užrakinti sąrašo aplanko"
-
-#. 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 "Parsiun�iamas %li failas iš %li (liko %s)"
-
-#: apt-pkg/acquire.cc:901
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Parsiun�iamas %li failas iš %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 ""
-"Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje "
-"jų panaudoti seni."
-
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nepavyko rasti paketo %s"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, 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"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Did not understand pin type %s"
-msgstr ""
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nepavyko atverti failo %s"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
@@ -2359,52 +2563,87 @@ msgstr "Rašomas naujas šaltinių sąrašas\n"
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Konstruojamas priklausomybių medis"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Galimos versijos"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Priklausomybių generavimas"
+
+#: 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:250
+#, c-format
+msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Maišos sumos nesutapimas"
+
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2430,6 +2669,209 @@ msgstr "Pastaba: pažymimas %s vietoje %s\n"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Nepavyko atverti DB failo %s: %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr ""
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nepavyko atverti failo %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Priklauso"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Priešpriklauso"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Siūlo"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Rekomenduoja"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Konfliktuoja"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Pakei�ia"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Pakei�ia"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Sugadina"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "Svarbu"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "privaloma"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standartinis"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "nebūtinas"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "papildomas"
+
+#: 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: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 ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %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 "Skaitomi paketų sąrašai"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr ""
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr ""
+
 #: apt-pkg/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2505,220 +2947,142 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, 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"
+msgid "Unable to parse package file %s (1)"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"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/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "Įdiegta %s"
-
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
-#, c-format
-msgid "Configuring %s"
-msgstr "Konfigūruojamas %s"
-
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
-#, c-format
-msgid "Removing %s"
-msgstr "Å alinamas %s"
-
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Visiškai pašalintas %s"
-
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "Command line option %s is not understood"
 msgstr ""
 
-#. 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/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Nepavyko atverti failo %s"
-
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Preparing %s"
-msgstr "Ruošiamas %s"
+msgid "Command line option %s is not boolean"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Unpacking %s"
-msgstr "IÅ¡pakuojamas %s"
+msgid "Option %s requires an argument."
+msgstr "Parametrui %s reikia argumento."
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Ruošiamasi konfigūruoti %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Installed %s"
-msgstr "Įdiegta %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Ruošiamasi %s pašalinimui"
+msgid "Option '%s' is too long"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Removed %s"
-msgstr "Pašalintas %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Ruošiamasi visiškai pašalinti %s"
+msgid "Invalid operation %s"
+msgstr "Klaidingas veiksmas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Completely removed %s"
-msgstr "Visiškai pašalintas %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
 msgstr ""
 
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Nepavyko užrakinti sąrašo aplanko"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:190
@@ -2834,54 +3198,11 @@ msgstr "Klaida užveriant failą"
 msgid "Problem syncing the file"
 msgstr "Klaida sinchronizuojant failÄ…"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-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 ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Baigta"
-
-#. 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 ""
+msgid "No keyring installed in %s."
+msgstr "Diegimas nutraukiamas."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -2936,527 +3257,219 @@ 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 ""
-
-#: 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 ""
-
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Opening configuration file %s"
-msgstr ""
+msgid "%c%s... Error!"
+msgstr "%c%s... Klaida!"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
+msgid "%c%s... Done"
+msgstr "%c%s... Baigta"
 
-#: apt-pkg/contrib/configuration.cc:820
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:837
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Baigta"
 
-#: apt-pkg/contrib/configuration.cc:877
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:884
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:897
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:900
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:950
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Diegimas nutraukiamas."
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nepavyko užrakinti sąrašo aplanko"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: 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"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:168
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "Įdiegta %s"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Parametrui %s reikia argumento."
+msgid "Configuring %s"
+msgstr "Konfigūruojamas %s"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
+msgid "Removing %s"
+msgstr "Å alinamas %s"
 
-#: apt-pkg/contrib/cmndline.cc:278
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Visiškai pašalintas %s"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Option '%s' is too long"
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Sense %s is not understood, try true or false."
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:391
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Invalid operation %s"
-msgstr "Klaidingas veiksmas %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 ""
-"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"
+msgid "Directory '%s' missing"
+msgstr "Trūksta aplanko „%s“"
 
-#: cmdline/apt-extracttemplates.cc:254
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Paketo plėtinių sąrašas yra per ilgas"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Klaida apdorojant aplankÄ… %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Å altinio plÄ—tinys yra per ilgas"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Klaida įrašant antraštę į turinio failą"
+msgid "Could not open file '%s'"
+msgstr "Nepavyko atverti failo %s"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Klaida apdorojant turinį %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-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:841
-msgid "No selections matched"
-msgstr "Nėra atitikmenų"
+msgid "Preparing %s"
+msgstr "Ruošiamas %s"
 
-#: ftparchive/apt-ftparchive.cc:919
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Kai kurių failų nėra paketų grupėje „%s“"
+msgid "Unpacking %s"
+msgstr "IÅ¡pakuojamas %s"
 
-#: ftparchive/cachedb.cc:65
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old"
+msgid "Preparing to configure %s"
+msgstr "Ruošiamasi konfigūruoti %s"
 
-#: ftparchive/cachedb.cc:83
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės "
-"versijos, prašome pašalinkite ir perkurkite duomenų bazę."
+msgid "Installed %s"
+msgstr "Įdiegta %s"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nepavyko nuskaityti nuorodos %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr ""
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr ""
+msgid "Preparing for removal of %s"
+msgstr "Ruošiamasi %s pašalinimui"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "Ä®: Nepavyko perskaityti aplanko %s\n"
+msgid "Removed %s"
+msgstr "Pašalintas %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "Ä®: Nepavyko patikrinti %s\n"
-
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "K: "
-
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "Ä®: "
-
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "K: Klaidos failui "
+msgid "Preparing to completely remove %s"
+msgstr "Ruošiamasi visiškai pašalinti %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Nepavyko išspręsti %s"
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Judesys medyje nepavyko"
+msgid "Completely removed %s"
+msgstr "Visiškai pašalintas %s"
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "Nepavyko atverti %s"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nepavyko įrašyti į %s"
 
-#: ftparchive/writer.cc:278
-#, c-format
-msgid " DeLink %s [%s]\n"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Nepavyko nuskaityti nuorodos %s"
-
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Nepavyko atsieti nuorodos %s"
-
-#: ftparchive/writer.cc:298
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nepavyko susieti %s su %s"
-
-#: ftparchive/writer.cc:308
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archyvas neturÄ—jo paketo lauko"
-
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s neturi perrašymo įrašo\n"
-
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s prižiūrėtojas yra %s, o ne %s\n"
-
-#: ftparchive/writer.cc:706
-#, c-format
-msgid "  %s has no source override entry\n"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: ftparchive/writer.cc:710
-#, c-format
-msgid "  %s has no binary override entry either\n"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nepavyko išskirti atminties"
-
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
-#, c-format
-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"
-
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nepavyko nuskaityti perrašymo failo %s"
-
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
-
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
-
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
-
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Nežinomas suspaudimo algoritmas „%s“"
-
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Suspaustai išves�iai %s reikia suspaudimo rinkinio"
-
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Nepavyko sukurti FILE*"
-
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "VidinÄ— klaida, nepavyko sukurti  %s"
-
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Nepavyko Nusk/Įraš į subprocesą/failą"
-
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Skaitymo klaida skai�iuojant MD5"
-
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nÄ—ra tikras DEB paketas."
diff --git a/po/mr.po b/po/mr.po
index e646856f6..25134d605 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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 "
 "<janabhaaratii@cdacmumbai.in>\n"
-"Language: \n"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: cmdline/apt-cache.cc:149
 #, c-format
@@ -96,75 +97,75 @@ msgstr "हिशेबात घेतलेली �कूण अवकाश
 msgid "Package file %s is out of sync."
 msgstr "पॅकेज संचिका %s सिंक�रोनाइज नाहीत"
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "त�म�हाला फक�त �कच नम�ना द�यावा लागेल"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "पॅकेज %s शोधण�यास असमर�थ आहे"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "पॅकेज संचिका:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "दृतिका सिंक नाही,पॅकेज संचिका क�ष-संदर�भ करता येत नाही"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "�कत�रित पॅकेजेस:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(मिळाले नाही)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "अधिष�ठापित केले:"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "उमेदवार:"
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(कोणताच नाही)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "पॅकेज (पिन):"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "आवृत�ती कोष�टक:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -326,7 +327,7 @@ msgid "Couldn't find package %s"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s  स�वहस�ते संस�थापित करायचे आहे.\n"
@@ -354,7 +355,7 @@ msgstr "डाऊनलोड डिरेकà¥�टरी कà¥�लूपबंà
 msgid "Must specify at least one package to fetch source for"
 msgstr "उगम शोधण�यासाठी किमान �क पॅकेज देणे/सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s उगम पॅकेज शोधणे शक�य नाही/शोधण�यास असमर�थ आहे"
@@ -380,7 +381,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द�या\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s मध�ये रिकामी जागा सांगू शकत नाही"
@@ -413,7 +414,7 @@ msgstr "%s उगम घ�या\n"
 msgid "Failed to fetch some archives."
 msgstr "काही अर�काईव�हज आणण�यास असमर�थ."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "डाऊनलोड संपूर�ण आणि डाऊनलोड मध�ये फक�त पद�धती"
 
@@ -422,66 +423,66 @@ msgstr "डाऊनलोड संपूर�ण आणि डाऊनलो
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s मध�ये आधीच उघडलेल�या उगमातील उघडलेल�याला सोडून द�या किंवा वगळा\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' आज�ञा स�ट�या करण�यास असमर�थ.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' पॅकेज संस�थापित केले आहे का ते पडताळून पहा.\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "बांधणी करणाऱ�या आज�ञा '%s' अयशस�वी.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "चाईल�ड प�रक�रिया अयशस�वी"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr "बिल�डेपस� कशासाठी ते पडताळण�यासाठी किमान �क पॅकेज सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s साठी बांधणी डिपेंडन�सी माहिती मिळवण�यास असमर�थ"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ला बांधणी डिपेंडन�स नाहीत.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, 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:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s अवलंबित�व %s साठी पूर�ण होण�यास असमर�थ: संस�थापित पॅकेज %s खूपच नवीन आहे"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -490,37 +491,37 @@ msgstr ""
 "आवृतीची मागणी पूर�ण करण�यासाठी %s पॅकेजची आवृत�ती उपलब�ध नाही,त�याम�ळे %s साठी %s "
 "डिपेंडन�सी पूर�ण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, 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:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s साठी %s डिपेंडन�सी पूर�ण होण�यास असमर�थ: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s साठी बांधणी-डिपेंडन�सीज पूर�ण होऊ शकत नाही."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "बांधणी-डिपेंडन�सीज क�रिया पूर�ण करण�यास असमर�थ "
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) ला जोडत आहे"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "प�रोग�राम गटाला तांत�रिक मदत दिली:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -607,16 +608,20 @@ msgstr ""
 " apt.conf(5)  प�स�तिका पाने पहा.\n"
 "         ह�या APT ला स�पर काऊ पॉवर�स आहेत\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "उगम शोधण�यासाठी किमान �क पॅकेज देणे/सांगणे गरजेचे आहे"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -625,6 +630,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -654,8 +660,9 @@ msgstr "%s ही आधीच नविन आवृत�ती आहे.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s ही आधीच नविन आवृत�ती आहे.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s साठी थांबलो पण ते तेथे नव�हते"
@@ -849,7 +856,7 @@ msgstr "सॉकेट तयार करू शकत नाही"
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "असमर�थ"
 
@@ -895,7 +902,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी
 msgid "Unable to accept connection"
 msgstr "जोडणी स�विकारण�यास असमर�थ"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "फाईल हॅश करण�यात त�र�टी"
 
@@ -1025,142 +1032,229 @@ msgstr "खालील सह�यांची खात�री करता
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "फाईल मध�ये लिहिण�यात चूक/त�र�टी"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर�व�हर मधून वाचण�यात चूक. लांब शेवट आणि बंद �ालेली जोडणी"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "सर�व�हर मधून वाचण�यात चूक"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "फाईल मध�ये लिहिण�यात चूक/त�र�टी"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "च�कले/असमर�थ निवड करा"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "जोडणी वेळेअभावी त�टली"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "निर�गत फाईल मध�ये लिहिताना त�र�टी/चूक"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "शीर�षकासाठी थांबले आहे...."
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "वाईट शीर�षक ओळ"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर�व�हरने अवैध प�रत�त�य�त�तर शीर�षक पाठविले"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर�व�हरने अवैध मजकूर-लांबी शीर�षक पाठविले "
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर�व�हरने अवैध मजकूर-विस�तार शीर�षक पाठविले"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर�व�हरने विस�तार तांत�रिक मदत जोडली"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "अपरिचित दिनांक प�रकार/स�वरूप "
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "च�कीचा शीर�षक डाटा"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "जोडणी अयशस�वी"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "अंतर�गत त�र�टी"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "दाबा"
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "मिळवा:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "आय.जी.�न."
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "दोष इ.आर.आर."
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr "[काम करत आहे]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"माध�यम बदल: कृपया नाव घातलेली सीडी घाला\n"
+"%s'\n"
+"'%s' ड�राईव�ह मध�ये व �ंटर कळ दाबा\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "धोक�याची सूचना:खालील पॅकेजेस� प�रमाणित कर� शकत नाही! "
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "प�रमाणीकरणाची धोक�याची सूचना द�र�लक�षित करा.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "काही पॅकेजेसचे प�रमाणिकरण होऊ शकत नाही"
+
+#: apt-private/private-download.cc:50
+#, fuzzy
+msgid "Install these packages without verification?"
+msgstr "पडताळून पाहिल�याशिवाय ही पॅकेजेस संस�थापित करायची का [हो/नाही]?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "%s  %s आणणे असफल\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "अंतर�गत त�र�टी, त�टलेल�या पॅकेजेस बरोबर  संस�थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव�ह अकार�यक�षम केले आहे"
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "अंतर�गत त�र�टी,क�रम अजून संपला नाही"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "या क�रियेनंतर, %sB डिस�क जागा मोकळी होईल.\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s मध�ये त�मच�याकडे प�रेशी जागा नाही."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "हो, मी म�ह�टल�याप�रमाणे करा!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1171,20 +1265,20 @@ msgstr ""
 "प�ढे '%s' उक�ती मध�ये लिहिणार \n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "व�यत�यय/बंद करा."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "त�म�हाला प�ढे जायचे आहे [Y/n]? "
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "काही संचिका डाऊनलोड करण�यास असमर�थ"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1192,20 +1286,20 @@ msgstr ""
 "काही आर�काइव�हज आणण�यास असमर�थ, कदाचित apt-get रन कर�न अद�ययावत करा किंवा --fix- "
 "बरोबर प�रयत�न कराहरवलेले/गहाळ?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "--fix- सापडत नाही आणि माध�यम/मिडिया अदलाबदल हे सध�या तांत�रिक मदत देऊ शकत नाही"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "न सापडणारी पॅकेजेस नीट करण�यास असमर�थ."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "संस�थापन खंडित करत आहे."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1215,15 +1309,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "आपण या गोष�टी काढून टाकता नये, ऑटोरिमूव�हर स�रू करता येत नाही"
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1241,15 +1335,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "खालील माहिती परिस�थिती निवळण�यासाठी मदत ठरू शकेल:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "अंतर�गत त�र�टी, AutoRemoverने स�टफला तोडले"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1259,7 +1353,7 @@ msgid_plural ""
 msgstr[0] "खालील नवीन पॅकेजेस स�वयंचलितपणे संस�थापित �ाली होती व आता आवश�यक नाहीत:"
 msgstr[1] "खालील नवीन पॅकेजेस स�वयंचलितपणे संस�थापित �ाली होती व आता आवश�यक नाहीत:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1267,7 +1361,7 @@ msgid_plural ""
 msgstr[0] "खालील नवीन पॅकेजेस स�वयंचलितपणे संस�थापित �ाली होती व आता आवश�यक नाहीत:"
 msgstr[1] "खालील नवीन पॅकेजेस स�वयंचलितपणे संस�थापित �ाली होती व आता आवश�यक नाहीत:"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1288,7 +1382,7 @@ msgstr ""
 "अनमेट डिपेंडन�सीज.�पीटी-गेट -�फ संस�थापन ('apt-get -f install') पॅकेजशिवाय प�रयत�न करा "
 "(किंवा पर�याय सांगा)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1300,68 +1394,68 @@ msgstr ""
 "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
 "किंवा ती येणाऱ�यांपैकी बाहेर हलविली असतील."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "त�टलेली पॅकेजेस"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "खालील अतिरिक�त पॅकेजेस संस�थापित होतील:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "स�चवलेली पॅकेजेस:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "शिफारस केलेली पॅकेजेस:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s सोडून देत आहे, ते आधिच संस�थापित केले आहे आणि प�ढिल आवृत�ती निश�चित केलेली नाही.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s सोडून देत आहे, ते आधिच संस�थापित केले आहे आणि प�ढिल आवृत�ती निश�चित केलेली नाही.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s चे प�नर�संस�थापन शक�य नाही, हे डाऊनलोड करता येत नाही.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ही आधीच नविन आवृत�ती आहे.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "%s साठी %s (%s) निवडलेली आवृत�ती.\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "%s साठी %s (%s) निवडलेली आवृत�ती.\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "%s पॅकेज संस�थापित केलेले नाही,म�हणून काढले नाही\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%s पॅकेज संस�थापित केलेले नाही,म�हणून काढले नाही\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1369,136 +1463,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr "[संस�थापित केले]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr "[संस�थापित केले]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr "[संस�थापित केले]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr "[संस�थापित केले]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "खालील पॅकेजेस मध�ये नमिळणाऱ�या निर�भरता/ डिपेन�डन�सीज आहेत:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "पण %s संस�थापित �ाले"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "पण %s संस�थापित करायचे आहे"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "पण ते संस�थापित करण�याजोगे नाही"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "पण ते आभासी पॅकेज आहे"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "पण ते संस�थापित केले नाही"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "पण ते संस�थापित होणार नाही"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr "किंवा"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "खालील पॅकेजेस मध�ये नमिळणाऱ�या निर�भरता/ डिपेन�डन�सीज आहेत:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "खालील नविन पॅकेजेस संस�थापित होतील:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "खालील पॅकेजेस परत ठेवली गेली:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "खालील पॅकेजेस प�ढिल आवृत�तीकृत होतील:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "खालील पॅकेजेस प�ढच�या आवृत�तीकृत होणार नाहीत:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "प�ढिल ठेवलेली पॅकेजेस बदलतील:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (च�या म�ळे %s)"
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1506,27 +1580,27 @@ msgstr ""
 "धोक�याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
 "त�म�हाला त�म�ही काय करत आहात हे कळेपर�यंत असं करता येणार नाही!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu प�ढे आवृत�तीकृत केले, %lu नव�याने संस�थापित केले,"
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu प�नर�संस�थापित केले,"
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu मागील आवृत�तीकृत केले,"
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu कायमचे काढून टाकण�यासाठी आणि %lu प�ढच�या आवृत�तीकृत �ालेली नाही.\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu संपूर�ण संस�थापित किंवा कायमची काढून टाकलेली नाही.\n"
@@ -1535,7 +1609,7 @@ msgstr "%lu संपूरà¥�ण संसà¥�थापित किंवा à¤
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1543,36 +1617,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "होय"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1586,36 +1652,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "धोक�याची सूचना:खालील पॅकेजेस� प�रमाणित कर� शकत नाही! "
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "प�रमाणीकरणाची धोक�याची सूचना द�र�लक�षित करा.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "काही पॅकेजेसचे प�रमाणिकरण होऊ शकत नाही"
-
-#: apt-private/private-download.cc:50
-#, fuzzy
-msgid "Install these packages without verification?"
-msgstr "पडताळून पाहिल�याशिवाय ही पॅकेजेस संस�थापित करायची का [हो/नाही]?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s  %s आणणे असफल\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1626,74 +1662,44 @@ msgstr "%s ला प�नर�नामांकन %s करण�यास
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "स�धारित आवृत�तीचा विधान आर�ग�य�मेंटस घेऊ    शकत नाही."
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "�ाले"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "दाबा"
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "मिळवा:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "आय.जी.�न."
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "दोष इ.आर.आर."
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr "[काम करत आहे]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"माध�यम बदल: कृपया नाव घातलेली सीडी घाला\n"
-"%s'\n"
-"'%s' ड�राईव�ह मध�ये व �ंटर कळ दाबा\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s वाचण�यास असमर�थ"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1768,36 +1774,430 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब�ध माहितीचे �कत�रीकरण करत आहे"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "हॅश �लिमेंट शोधूने काढण�यास असमर�थ!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s स�टॅट करण�यास असमर�थ"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "नेमून दिलेल�यात फेरबदल करण�यास अयशस�वी"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s मध�ये लिहिण�यास असमर�थ "
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion/�ड डायव�हर�जन मध�ये आंतरिक दोष"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf आवृत�ती मिळू शकत नाही,debconf अधिष�ठापित �ाली काय?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "पॅकेजेसची विस�तारित यादी खूप मोठी आहे"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "डायव�हर�जन प�नः लिहिण�यास प�रयत�न करत आहे,%s -> %s and %s/%s"
+msgid "Error processing directory %s"
+msgstr "त�र�टी प�रक�रिया मार�गदर�शिका%s "
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "उगमस�थानाची विस�तारित यादी खूप मोठी आहे"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "शीर�षक संचिकेमधून मजकूर संचिकेत लिहिण�यात त�र�टी"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "%s -> %s डायव�हर�जन द�प�पट मिळवा"
+msgid "Error processing contents %s"
+msgstr "त�र�टी प�रक�रिया मजकूर %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "निवडक भाग ज�ळत नाही"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "%s/%s संचिरित संचिकाची द�सरी प�रत/नक�कल"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "`%s' पॅकेज संचिका सम�हातील काही संचिका गहाळ आहेत"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB खराब �ाली होती, संचिका %s.old म�हणून प�नर�नामांकित केली"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB ज�ने आहे,%s प�ढच�या आवृतीसाठी प�रयत�न करत आहे"
+
+#: ftparchive/cachedb.cc:94
+#, 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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "%s: %s DB संचिका उघडण�यास असमर�थ"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s स�टेट करण�यास असमर�थ"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "%s वाचणारा द�वा असमर�थ"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "अर�काईव�ह मध�ये नियंत�रण माहिती संच नाही"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "अर�काईव�ह ला पॅकेज जागा नाही"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "%s ला ओव�हरराईड/द�र�लक�षित जागा नाही\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "%s देखभालकर�ता हा %s आणि %s नाही \n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "%s ला उगम ओव�हरराईड/द�र�लक�षित जागा नाही\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "%s ला द�वयंक ओव�हरराईड जागा नाही\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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 द�वा मोकळा/स�टा करण�यास अडचण"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s ला प�नर�नामांकन %s करण�यास असमर�थ "
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1823,17 +2223,6 @@ msgstr "डायव�हर�जन इच�छित %s/%s मध�ये
 msgid "The diversion path is too long"
 msgstr "डायव�हर�जन मार�ग हा खूप लांब आहे"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1862,30 +2251,36 @@ msgstr "File %s/%s, %s पॅकेज मधलà¥�या à¤�का वर पà¥
 msgid "Unable to stat %s"
 msgstr "%s स�टॅट करण�यास असमर�थ"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "स�टा करण�यासाठी बोलावलेला/आणलेला सांधा(ड�रापनोड)अज�नही ज�ळलेलाच सांधा(लिंकनोड) आहे"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s फाईल बंद करण�यास असमर�थ"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "हॅश �लिमेंट शोधूने काढण�यास असमर�थ!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "नेमून दिलेल�यात फेरबदल करण�यास अयशस�वी"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion/�ड डायव�हर�जन मध�ये आंतरिक दोष"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "हा वैध DEB अर�काईव�ह नाही,'%s' मेंबर उपलब�ध नाही"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "डायव�हर�जन प�नः लिहिण�यास प�रयत�न करत आहे,%s -> %s and %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "अंतर�गत त�र�टी,%s मेंबर शोधू शकत नाही"
+msgid "Double add of diversion %s -> %s"
+msgstr "%s -> %s डायव�हर�जन द�प�पट मिळवा"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "अनपार�सेबल नियंत�रण फाईल"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "%s/%s संचिरित संचिकाची द�सरी प�रत/नक�कल"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1933,198 +2328,52 @@ msgstr "टार(टेपअरà¥�काईवà¥�ह) चेकसम चà¥�à¤
 msgid "Unknown TAR header type %u, member %s"
 msgstr "अपरिचित TAR शीर�षक प�रकार %u, मेंबर %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "'%s' पॅकेजींग प�रणाली सहाय�यकारी नाही"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "योग�य असा पॅकेजिंग प�रणाली प�रकार निश�चित करण�यास असमर�थ "
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i माहितीसंच लिहिले.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच  लिहिले.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "हा वैध DEB अर�काईव�ह नाही,'%s' मेंबर उपलब�ध नाही"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
+msgid "Internal error, could not locate member %s"
+msgstr "अंतर�गत त�र�टी,%s मेंबर शोधू शकत नाही"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "अनपार�सेबल नियंत�रण फाईल"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "हॅश बेरीज ज�ळत नाही"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "पॅकेजच�या याद�या किंवा संचिकेची स�थिती स�पष�ट होऊ शकत नाही किंवा ती उघडू शकत नाही."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "त�म�ही ह�या समस�यांचे निवारण करण�यासाठी  apt-get update प�रोग�राम चालू कर� शकता"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "उगमांच�या याद�या वाचता येणार नाहीत."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "पॅकेज अस�थाई स�मृतिकोष"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "पॅकेज अस�थाई स�मृतिकोष फाईल खराब �ाली आहे"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "पॅकेज अस�थाई स�मृतिकोष फाईल ही विजोड आवृत�ती आहे"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "पॅकेज अस�थाई स�मृतिकोष फाईल खराब �ाली आहे"
-
-#: apt-pkg/pkgcache.cc:174
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "'%s' आवृत�तीकरण प�रणालीला हे APT तांत�रिक मदत देऊ शकत नाही"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "पॅकेज अस�थाई स�मृतीकोष वेगळ�या वास�त�विद�ये साठी बनवला गेला"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "अवलंबित"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "पूर�व अवलंबित"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "स�चवणे"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "शिफारस"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "परस�परविरोध"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "परत त�याठिकाणी आणा"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "अप�रचलित"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "तोडले"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "अत�यावश�यक"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "आवश�यक"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "मानक"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "�च�छिक"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "अधिक"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "%s कार�यपध�दतीचा ड�राइव�हर सापडू शकला नाही. "
+msgid "List directory %spartial is missing."
+msgstr "संचयिका यादीत %s पार�शल हरवले आहे."
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' पॅकेज संस�थापित केले आहे का ते पडताळून पहा.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s कार�यपध�दती योग�य रीतीने स�र� �ालेली नाही"
+msgid "Archives directory %spartial is missing."
+msgstr "ऑर�काइव�ह संचयिका %spartial गायब आहे."
 
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया '%s' लेबल असलेली डिस�क '%s' या ड�राइव�हमध�ये ठेवा आणि �न�टर कळ दाबा."
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "संचयिका यादीला क�ल�प लावण�यात असमर�थ"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "'%s' प�रकारची निर�देशक संचिका सहाय�यकारी नाही"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s StateFile उघडणे असफल"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li ची %li(%s राहिलेले) संचिका प�न:प�राप�त करीत आहे"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s तात�प�रत�या StateFile मध�ये लिहिणे असफल"
+msgid "Retrieving file %li of %li"
+msgstr "%li ची %li संचिका प�न:प�राप�त करीत आहे"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2144,35 +2393,35 @@ msgstr "आकार ज�ळतनाही"
 msgid "Invalid file format"
 msgstr "%s अवैध क�रिया"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "%s (1) पॅकेज फाईल पार�स करण�यात असमर�थ"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "प�ढील कळ ओळखचिन�हांसाठी सार�वजनिक कळ उपलब�ध नाही:\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2180,12 +2429,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2194,12 +2443,12 @@ msgstr ""
 "मी %s पॅकेजकरीता संचिका शोधण�यास  समर�थ नव�हतो. याचा अर�थ असाकी त�म�हाला हे पॅकेज स�वहस�ते "
 "स�थिर/निश�चित करण�याची गरज आहे(हरवलेल�या आर�चम�ळे) "
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2207,172 +2456,113 @@ msgstr ""
 "पॅकेज यादीची/स�चीची संचिका दूषित/खराब �ालेली आहे. संचिका नाव नाही: पॅकेजकरीता क�षेत�र/"
 "ठिकाण %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "अस�थायी स�मृतिकोष मध�ये विसंगत आवृतीकरण प�रणाली आहे"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "%s कार�यपध�दतीचा ड�राइव�हर सापडू शकला नाही. "
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (पॅकेज शोधतांना) प�रक�रिया करीत असतांना दोष आढळून आला"
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' पॅकेज संस�थापित केले आहे का ते पडताळून पहा.\n"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"अरेवा!, त�म�ही तर ह�या �पिटीच�या कार�यक�षमतेपेक�षाही पॅकेज नांवांच�या संख�येची मर�यादा ओलांडली "
-"आहे."
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s कार�यपध�दती योग�य रीतीने स�र� �ालेली नाही"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"अरेवा!, त�म�ही तर ह�या �पिटीच�या कार�यक�षमतेपेक�षाही आवृत�त�या संख�येची मर�यादा ओलांडली आहे."
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया '%s' लेबल असलेली डिस�क '%s' या ड�राइव�हमध�ये ठेवा आणि �न�टर कळ दाबा."
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "अरेवा!, त�म�ही तर ह�या �प�टच�या कार�यक�षमतेपेक�षाही विवरण संख�येची मर�यादा ओलांडली आहे."
+#: 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 ""
+"%s पॅकेज प�नः:अधिष�ठापित करण�याची गरज आहे, परंत� मला त�यासाठी ऑर�काइव�ह सापडू शकले नाही."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
-"अरेवा!, त�म�ही तर ह�या �पिटीच�या कार�यक�षमतेपेक�षाही अवलंबित/विसंबून असलेल�या संख�येची मर�यादा "
-"ओलांडली आहे."
+"दोष,पॅकेज समस�या निवारक::निवारण  करतांना अडथळा निर�माण �ाला, ह�याचे कारण स�थगित  "
+"पॅकेजेस असू शकते."
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "अवलंबित/विसंबून असणाऱ�या संचिकांची प�रक�रिया करीत असतांना पॅकेज %s %s सापडले नाही "
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "अडचणी दूर करण�यास असमर�थ, त�म�ही त�टलेले पॅकेज घेतलेले आहे."
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "%s उगम पॅकेज यादी स�रू करता येत नाही"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+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 "पॅकेज याद�या वाचत आहोत"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "त�म�ही ह�या समस�यांचे निवारण करण�यासाठी  apt-get update प�रोग�राम चालू कर� शकता"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "तरतूद/प�रवलेल�या संचिका संग�रहित करीत आहे"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "उगमांच�या याद�या वाचता येणार नाहीत."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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 त�र�टी उगम निवडक संचयस�थानात संग�रहित होत आहे"
+msgid "Release '%s' for '%s' was not found"
+msgstr "'%s' साठी '%s' आवृत�ती सापडली नाही"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "विक�रेता गट %s मध�ये बोटाचे ठसे नाहीत"
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%s' साठी '%s' आवृत�ती सापडली नाही"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "संचयिका यादीत %s पार�शल हरवले आहे."
+msgid "Couldn't find task '%s'"
+msgstr "%s कार�य सापडू शकले नाही"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "ऑर�काइव�ह संचयिका %spartial गायब आहे."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr "%li ची %li(%s राहिलेले) संचिका प�न:प�राप�त करीत आहे"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, 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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"काही अन�क�रमणिका संचयिका डाऊनलोड    करण�यास असमर�थ,त�या द�र�लक�षित �ाल�या, किंवा "
-"त�या�वजी ज�न�या वापरल�या गेल�या."
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "त�म�ही त�मच�या उगमस�थान यादीत URI घाला"
-
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स�टॅट करण�यात असमर�थ. "
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "पसंतीच�या संचिकेत अवैध माहितीसंच, पॅकेजला शीर�षक नाही "
-
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, 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 "पिन करिता प�राधान�य/अग�रक�रम (किंवा शून�य)निर�देशीत केलेला नाही"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "%s फाईल उघडता येत नाही"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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 खूप लांब आहे."
+msgstr "%2$s स�त�रोत स�चीमध�ये ओळ %1$u खूप लांब आहे."
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2449,54 +2639,86 @@ msgstr "नविन सà¥�तà¥�रोत सूची लिहित आहà¥
 msgid "Source list entries for this disc are:\n"
 msgstr "ह�या डिस�क/चकती करिता स�त�रोत सूचीच�या प�रवेशिका आहेत: \n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"%s पॅकेज प�नः:अधिष�ठापित करण�याची गरज आहे, परंत� मला त�यासाठी ऑर�काइव�ह सापडू शकले नाही."
+msgid "Unable to stat %s."
+msgstr "%s स�टॅट करण�यात असमर�थ. "
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"दोष,पॅकेज समस�या निवारक::निवारण  करतांना अडथळा निर�माण �ाला, ह�याचे कारण स�थगित  "
-"पॅकेजेस असू शकते."
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "अवलंबित रचना बांधणी करत आहे"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-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 "Failed to open StateFile %s"
+msgstr "%s StateFile उघडणे असफल"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s तात�प�रत�या StateFile मध�ये लिहिणे असफल"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "%s (1) पॅकेज फाईल पार�स करण�यात असमर�थ"
+msgid "Wrote %i records.\n"
+msgstr "%i माहितीसंच लिहिले.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "%s (२) पॅकेज फाईल पार�स करण�यात असमर�थ"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच  लिहिले.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
+
+#: 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 "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "हॅश बेरीज ज�ळत नाही"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2523,6 +2745,218 @@ msgstr "%s डायवà¥�हरà¥�जन फाईलमधà¥�ये अवैà
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "%s (1) पॅकेज फाईल पार�स करण�यात असमर�थ"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "'%s' पॅकेजींग प�रणाली सहाय�यकारी नाही"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "योग�य असा पॅकेजिंग प�रणाली प�रकार निश�चित करण�यास असमर�थ "
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "%s फाईल उघडता येत नाही"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "पॅकेज अस�थाई स�मृतिकोष"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "पॅकेज अस�थाई स�मृतिकोष फाईल खराब �ाली आहे"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "पॅकेज अस�थाई स�मृतिकोष फाईल ही विजोड आवृत�ती आहे"
+
+#: apt-pkg/pkgcache.cc:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "पॅकेज अस�थाई स�मृतिकोष फाईल खराब �ाली आहे"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "'%s' आवृत�तीकरण प�रणालीला हे APT तांत�रिक मदत देऊ शकत नाही"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "पॅकेज अस�थाई स�मृतीकोष वेगळ�या वास�त�विद�ये साठी बनवला गेला"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "अवलंबित"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "पूर�व अवलंबित"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "स�चवणे"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "शिफारस"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "परस�परविरोध"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "परत त�याठिकाणी आणा"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "अप�रचलित"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "तोडले"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "अत�यावश�यक"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "आवश�यक"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "मानक"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "�च�छिक"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "अधिक"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"अरेवा!, त�म�ही तर ह�या �पिटीच�या कार�यक�षमतेपेक�षाही पॅकेज नांवांच�या संख�येची मर�यादा ओलांडली "
+"आहे."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"अरेवा!, त�म�ही तर ह�या �पिटीच�या कार�यक�षमतेपेक�षाही आवृत�त�या संख�येची मर�यादा ओलांडली आहे."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "अरेवा!, त�म�ही तर ह�या �प�टच�या कार�यक�षमतेपेक�षाही विवरण संख�येची मर�यादा ओलांडली आहे."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"अरेवा!, त�म�ही तर ह�या �पिटीच�या कार�यक�षमतेपेक�षाही अवलंबित/विसंबून असलेल�या संख�येची मर�यादा "
+"ओलांडली आहे."
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "%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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO त�र�टी उगम निवडक संचयस�थानात संग�रहित होत आहे"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "'%s' प�रकारची निर�देशक संचिका सहाय�यकारी नाही"
+
+#: 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 record in the preferences file %s, no Package header"
+msgstr "पसंतीच�या संचिकेत अवैध माहितीसंच, पॅकेजला शीर�षक नाही "
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2556,27 +2990,27 @@ msgstr "सà¥�तà¥�रोत सà¥�ची %s (डीआयà¤�सटी पाà¤
 #: apt-pkg/sourcelist.cc:206
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "स�त�रोत स�ची %s (यूआरआय) मध�ये %lu वाईट/व�यंग रेषा"
+msgstr "स�त�रोत स�ची %2$s (यूआरआय) मध�ये %1$lu वाईट/व�यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:208
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr "स�त�रोत स�ची %s (डिआय�सटी) मध�ये %lu वाईट/व�यंग रेषा"
+msgstr "स�त�रोत स�ची %2$s (डिआय�सटी) मध�ये %1$lu वाईट/व�यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:211
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "स�त�रोत स�ची %s (यूआरआय पार�स) मध�ये %lu वाईट/व�यंग रेषा"
+msgstr "स�त�रोत स�ची %2$s (यूआरआय पार�स) मध�ये %1$lu वाईट/व�यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:217
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "स�त�रोत स�ची %s (absolute dist) मध�ये %lu वाईट/व�यंग रेषा"
+msgstr "स�त�रोत स�ची %2$s (absolute dist) मध�ये %1$lu वाईट/व�यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:224
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "स�त�रोत स�ची %s (डीआय�सटी पार�स) मध�ये %lu वाईट/व�यंग रेषा"
+msgstr "स�त�रोत स�ची %2$s (डीआय�सटी पार�स) मध�ये %1$lu वाईट/व�यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:335
 #, c-format
@@ -2586,7 +3020,7 @@ msgstr "%s उघडत आहे"
 #: apt-pkg/sourcelist.cc:371
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "स�त�रोत स�ची %s (प�रकार) मध�ये %u वाईट/व�यंग रेषा"
+msgstr "स�त�रोत स�ची %2$s (प�रकार) मध�ये %1$u वाईट/व�यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:375
 #, c-format
@@ -2598,221 +3032,143 @@ msgstr "%s सà¥�तà¥�रोत सà¥�चीमधà¥�ये %u रेषेवà
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "%s स�त�रोत स�चीमध�ये %u रेषेवर '%s' प�रकार माहित नाही "
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "'%s' साठी '%s' आवृत�ती सापडली नाही"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "त�म�ही त�मच�या उगमस�थान यादीत URI घाला"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%s' साठी '%s' आवृत�ती सापडली नाही"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "%s कार�य सापडू शकले नाही"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "%s पॅकेज सापडू शकले नाही"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "%s पॅकेज सापडू शकले नाही"
+msgid "Unable to parse package file %s (1)"
+msgstr "%s (1) पॅकेज फाईल पार�स करण�यात असमर�थ"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "%s (२) पॅकेज फाईल पार�स करण�यात असमर�थ"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
+"काही अन�क�रमणिका संचयिका डाऊनलोड    करण�यास असमर�थ,त�या द�र�लक�षित �ाल�या, किंवा "
+"त�या�वजी ज�न�या वापरल�या गेल�या."
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "विक�रेता गट %s मध�ये बोटाचे ठसे नाहीत"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "%s माऊंट पॉईंट स�टॅट करण�यास असमर�थ"
 
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "सीडी-रॉम स�टॅट करण�यास असमर�थ"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "%s संस�थापित होत आहे"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "आदेश रेखा पर�याय '%c' [पासून %s] हे माहित नाही."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "%s संरचित होत आहे"
+msgid "Command line option %s is not understood"
+msgstr "आदेश रेखा पर�याय %s नीट समजला नाही"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "%s काढून टाकत आहे"
-
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s संपूर�ण काढून टाकले"
+msgid "Command line option %s is not boolean"
+msgstr "आदेश रेखा पर�याय %s हे बूलियन नाही"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Option %s requires an argument."
+msgstr "पर�याय %s साठी ऑर�ग�मेंट पाहिजे"
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "संस�थापना-पश�चात ट�रिगर %s चालवत आहे"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "पर�याय %s: संरचितेच�या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल�य>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "'%s' संचयिका गहाळ आहे"
-
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "%s फाईल उघडता येत नाही"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "%s पर�याय ला पूर�णांक ऑर�ग�मेंट पाहिजे,'%s' नको"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Preparing %s"
-msgstr "%s तयार करित आहे"
+msgid "Option '%s' is too long"
+msgstr "'%s' पर�याय खूप लांब आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Unpacking %s"
-msgstr "%s स�टे/मोकळे करीत आहे "
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s संवेदना हे समजत नाही, चूक की बरोबर चा प�रयत�न करा."
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "%s संरचने साठी तयार करत आहे"
+msgid "Invalid operation %s"
+msgstr "%s अवैध क�रिया"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Installed %s"
-msgstr "%s संस�थापित �ाले"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "संक�षिप�तर�पाचा माहित नसलेला प�रकार: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s ला काढून टाकण�यासाठी तयारी करत आहे"
+msgid "Opening configuration file %s"
+msgstr "%s संरचना फाईल उघडत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Removed %s"
-msgstr "%s काढून टाकले"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "रचनेच�या नियमांचा दोष %s:%u: ब�लॉक नावाशिवाय स�रू होतो."
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s संपूर�ण काढून टाकण�याची तयारी करत आहे"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "रचनेच�या नियमांचा दोष : %s:%u: मालफॉर�मड� टॅग"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s संपूर�ण काढून टाकले"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "रचनेच�या नियमांचा दोष %s:%u: म�ल�यांच�या नंतर अधिक जंक"
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "रचनेच�या नियमांचा दोष %s:%u: खूपच �कात �क इनक�लूडस�"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर�शक असहाय�यकारी"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "संचयिका यादीला क�ल�प लावण�यात असमर�थ"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "रचनेच�या नियमांचा दोष %s:%u: दिशादर�शक फक�त उच�च पातळीवर केले जाऊ शकतात"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "नियम रचनेचा दोष %s:%u: फाईलच�या अंती अधिक जंक"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2927,54 +3283,11 @@ msgstr "फाईल अनलिंकिंग करण�यात अडच
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... �ाले"
-
-#. 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 निवडक भाग सापडत नाही"
+msgid "No keyring installed in %s."
+msgstr "संस�थापन खंडित करत आहे."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3028,520 +3341,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "रचनेच�या नियमांचा दोष %s:%u: ह�या पासून  समाविष�ट "
+msgid "%c%s... Error!"
+msgstr "%c%s... चूक/त�र�टी!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, 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: दिशादर�शक फक�त उच�च पातळीवर केले जाऊ शकतात"
+msgid "%c%s... Done"
+msgstr "%c%s... �ाले"
 
-#: apt-pkg/contrib/configuration.cc:950
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "नियम रचनेचा दोष %s:%u: फाईलच�या अंती अधिक जंक"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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 हे बूलियन नाही"
+msgid "%c%s... %u%%"
+msgstr "%c%s... �ाले"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "पर�याय %s साठी ऑर�ग�मेंट पाहिजे"
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "पर�याय %s: संरचितेच�या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल�य>."
+msgid "%lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "%s पर�याय ला पूर�णांक ऑर�ग�मेंट पाहिजे,'%s' नको"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "'%s' पर�याय खूप लांब आहे"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s संवेदना हे समजत नाही, चूक की बरोबर चा प�रयत�न करा."
+msgid "Selection %s not found"
+msgstr "%s निवडक भाग सापडत नाही"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
-"उपयोग : �प�ट - �क�स�ट�रॅक�ट टेंप�लेट�स संचिका १[संचिका २..... ]\n"
-" \n"
-"�प�ट- �क�स�टॅक�ट टेंम�प�लेट�स हे संरचना व नम�न�याची माहिती काढण�याचे साधन आहे \n"
-"डेबियन पॅकेजेस मधून \n"
-"\n"
-"पर�याय : \n"
-" -h    हा साह�याकारी मजकूर \n"
-" -t     टेंप डिर निर�धारित करा \n"
-"  -c=?  ही संरचना संचिका वाचा \n"
-" -o=?  �खादा अहेत�क संरचना पर�याय निर�धारित करा जसे-  -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:254
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "पॅकेजेसची विस�तारित यादी खूप मोठी आहे"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "त�र�टी प�रक�रिया मार�गदर�शिका%s "
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "उगमस�थानाची विस�तारित यादी खूप मोठी आहे"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "शीर�षक संचिकेमधून मजकूर संचिकेत लिहिण�यात त�र�टी"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "संचयिका यादीला क�ल�प लावण�यात असमर�थ"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "त�र�टी प�रक�रिया मजकूर %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "निवडक भाग ज�ळत नाही"
 
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "`%s' पॅकेज संचिका सम�हातील काही संचिका गहाळ आहेत"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB खराब �ाली होती, संचिका %s.old म�हणून प�नर�नामांकित केली"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB ज�ने आहे,%s प�ढच�या आवृतीसाठी प�रयत�न करत आहे"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
-"DB स�वर�प वैध नाही. जर त�म�ही apt च�या ज�न�या आवृत�तीपासून प�ढिल आवृत�तीकृत करत असाल तर, "
-"कृपया माहितीसंच काढून टाका आणि प�नर�निर�मित करा"
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "%s: %s DB संचिका उघडण�यास असमर�थ"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s वाचणारा द�वा असमर�थ"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "अर�काईव�ह मध�ये नियंत�रण माहिती संच नाही"
 
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "संकेतक घेण�यास असमर�थ"
-
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "धोक�याची सूचना:%s संचयिका वाचण�यास असमर�थ \n"
+msgid "Installing %s"
+msgstr "%s संस�थापित होत आहे"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, 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 "ई: संचिकेला लागू होणाऱ�या च�का"
+msgid "Configuring %s"
+msgstr "%s संरचित होत आहे"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "%s सोडवण�यास असमर�थ"
+msgid "Removing %s"
+msgstr "%s काढून टाकत आहे"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "ट�री चालणे असमर�थ"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s संपूर�ण काढून टाकले"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s उघडण�यास असमर�थ"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "%s [%s] डी द�वा\n"
+msgid "Running post-installation trigger %s"
+msgstr "संस�थापना-पश�चात ट�रिगर %s चालवत आहे"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "%s वाचणारा द�वा असमर�थ"
+msgid "Directory '%s' missing"
+msgstr "'%s' संचयिका गहाळ आहे"
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "%s द�वा काढण�यास असमर�थ"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "%s फाईल उघडता येत नाही"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "%s चा %s द�वा साधण�यास असमर�थ"
+msgid "Preparing %s"
+msgstr "%s तयार करित आहे"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "%sB हीट ची डिलींक मर�यादा\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "अर�काईव�ह ला पॅकेज जागा नाही"
+msgid "Unpacking %s"
+msgstr "%s स�टे/मोकळे करीत आहे "
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "%s ला ओव�हरराईड/द�र�लक�षित जागा नाही\n"
+msgid "Preparing to configure %s"
+msgstr "%s संरचने साठी तयार करत आहे"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "%s देखभालकर�ता हा %s आणि %s नाही \n"
+msgid "Installed %s"
+msgstr "%s संस�थापित �ाले"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "%s ला उगम ओव�हरराईड/द�र�लक�षित जागा नाही\n"
+msgid "Preparing for removal of %s"
+msgstr "%s ला काढून टाकण�यासाठी तयारी करत आहे"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "%s ला द�वयंक ओव�हरराईड जागा नाही\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc-स�मरणस�थळ शोधण�यास असमर�थ"
+msgid "Removed %s"
+msgstr "%s काढून टाकले"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "%s संपूर�ण काढून टाकण�याची तयारी करत आहे"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "%s संपूर�ण काढून टाकले"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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 संकलित आऊटप�ट/निर�गत साठी संक�षेप संचाची गरज"
+msgid "Can not write log (%s)"
+msgstr "%s मध�ये लिहिण�यास असमर�थ "
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "संचिका * तयार करण�यास असमर�थ"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "नविन प�रक�रिया(प�रोसेस) निर�माण करण�यास असमर�थ"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "चॉईल�ड(प�रोसेस)ला संकलित करा"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "अंतर�गत त�र�टी, %s तयार करण�यास असमर�थ"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO ची उपक�रिया/संचिका असमर�थ "
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5 कामप�य�टींग करतांना वाचण�यासाठी असमर�थ"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s द�वा मोकळा/स�टा करण�यास अडचण"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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 "अनोळखी पॅकेज माहिती संच!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "अंतर�गत त�र�टी,ऑलअपग�रेडने स�टफला तोडले"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s हे वैध डीईबी पॅकेज नाही "
diff --git a/po/nb.po b/po/nb.po
index b7674c187..445f1cca5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,17 +1,17 @@
-# Norsk Bokmal translation of messages in APT.

-# The file is available under Gnu Public License version 2.

-# Get the license from http://www.gnu.org/licenses/gpl.txt

-# Copyright:

-# Lars Bahner <bahner@debian.org>, 2002-2003.

-# Axel Bojer <axelb@skolelinux.no>, 2003-2004.

-# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.

-# Bjorn Steensrud <bjornst@powertech.no>, 2004.

-# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2010.

+# Norsk Bokmal translation of messages in APT.
+# The file is available under Gnu Public License version 2.
+# Get the license from http://www.gnu.org/licenses/gpl.txt
+# Copyright:
+# Lars Bahner <bahner@debian.org>, 2002-2003.
+# Axel Bojer <axelb@skolelinux.no>, 2003-2004.
+# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
+# Bjorn Steensrud <bjornst@powertech.no>, 2004.
+# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -101,75 +101,75 @@ msgstr "Samlet mengde redegjort plass: "
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ikke oppdatert."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Du må oppgi minst ett søkemønster"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Klarer ikke å finne pakken %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "LÃ¥ste pakker:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(ikke funnet)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Pakke låst til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -332,7 +332,7 @@ msgid "Couldn't find package %s"
 msgstr "Klarte ikke å finne pakken %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s satt til manuell installasjon.\n"
@@ -360,7 +360,7 @@ msgstr "Klarer ikke å låse nedlastingsmappa"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke å finne en kildekodepakke for %s"
@@ -391,7 +391,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hopper over allerede nedlastet fil «%s»\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Klarte ikke bestemme ledig plass i %s"
@@ -424,7 +424,7 @@ msgstr "Skaffer kildekode %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke å skaffe alle arkivene."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
 
@@ -433,68 +433,68 @@ msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, 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:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -503,37 +503,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:1357
+#: cmdline/apt-get.cc:1358
 #, 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:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke å behandle forutsetningene for bygging"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kobler til %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -622,16 +622,20 @@ msgstr ""
 "for mer informasjon og flere valg.\n"
 "                       Denne APT har kraften til en Superku.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -640,6 +644,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -669,8 +674,9 @@ msgstr "%s er allerede nyeste versjon.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventet på %s, men den ble ikke funnet"
@@ -866,7 +872,7 @@ msgstr "Klarte ikke å opprette en sokkel"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislyktes"
 
@@ -912,7 +918,7 @@ msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
 msgid "Unable to accept connection"
 msgstr "Klarte ikke å godta tilkoblingen"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
@@ -1043,91 +1049,181 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Utvalget mislykkes"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Tidsavbrudd på forbindelsen"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Venter på hoder"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Ødelagt hodelinje"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Ukjent datoformat"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Ødelagte hodedata"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Funnet "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Hent:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Feil "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Arbeider]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Bytte av media: sett inn CD-en som er merket\n"
+"  «%s»\n"
+"i «%s» og trykk «Enter»\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Autentiseringsadvarsel overstyrt.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Noen pakker ble ikke autentisert"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Installer disse pakkene uten verifikasjon?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Klarte ikke å skaffe %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil, sortering fullførte ikke"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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 "
@@ -1135,53 +1231,49 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Ja, gjør som jeg sier!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1192,19 +1284,19 @@ msgstr ""
 "For å fortsette skriv inn teksten «%s»\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Avbryter."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Vil du fortsette?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Klarte ikke laste ned alle filene"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1212,19 +1304,19 @@ msgstr ""
 "Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
 "«--fix-missing»."
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Klarer ikke å rette på manglende pakker."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Avbryter installasjonen."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1238,15 +1330,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1264,15 +1356,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1283,7 +1375,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1291,7 +1383,7 @@ 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:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1310,7 +1402,7 @@ msgstr ""
 "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
 "angi en løsning)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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,71 +1414,71 @@ msgstr ""
 "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
 "distribusjonen."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Følgende ekstra pakker vil bli installert."
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Foreslåtte pakker:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Anbefalte pakker"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Hopper over %s siden den ikke er installert eller kun oppgraderinger er "
 "ønsket.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1394,136 +1486,120 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Installert]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Installert]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Installert]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Installert]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installeres"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "men lar seg ikke installere"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "men er en virtuell pakke"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "men er ikke installert"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "men skal ikke installeres"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " eller"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Følgende NYE pakker vil bli installert:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Følgende pakker vil bli FJERNET:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Følgende pakker er holdt tilbake:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Følgende pakker vil bli oppgradert:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Følgende pakker vil bli NEDGRADERT:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Følgende pakker vil bli endret:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (pga. %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1531,27 +1607,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nylig installerte, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installert på nytt, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
@@ -1560,7 +1636,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[J/n]"
 
@@ -1568,36 +1644,28 @@ msgstr "[J/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1611,39 +1679,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Autentiseringsadvarsel overstyrt.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Noen pakker ble ikke autentisert"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Installer disse pakkene uten verifikasjon?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Klarte ikke å skaffe %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1654,74 +1689,44 @@ msgstr "Klarte ikke å endre navnet på %s til %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdaterings-kommandoen tar ingen argumenter"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Utført"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Funnet "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Hent:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Feil "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Arbeider]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Bytte av media: sett inn CD-en som er merket\n"
-"  «%s»\n"
-"i «%s» og trykk «Enter»\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarer ikke å lese %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1796,36 +1801,431 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
 msgid "Merging available information"
 msgstr "Fletter tilgjengelig informasjon"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode ble startet på et knutepunkt som ennå er lenket"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Fant ikke nøkkelelementet."
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Klarte ikke å få statusen på %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Klarte ikke å tildele avledning"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kan ikke skrive til %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Intern feil i AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Lista over pakkeutvidelser er for lang"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Feil ved lesing av katalogen %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Lista over kildeutvidelser er for lang"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Feil ved skriving av topptekst til innholdsfila"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dobbel tillegging av avledning %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Det oppsto en feil ved lesing av %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Ingen utvalg passet"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Dobbel oppsettsfil %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Enkelte filer mangler i pakkegruppa «%s»"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Databasen er gammel, forsøker å oppgradere %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Klarte ikke å åpne Databasefila %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Klarte ikke å få statusen på %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Klarte ikke å lese lenken %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen kontrollpost"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Arkivet har ikke noe pakkefelt"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s har ingen overstyringsoppføring\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr " %s-vedlikeholderen er %s, ikke %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s har ingen kildeoverstyringsoppføring\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Klarte ikke å endre navnet på %s til %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1851,17 +2251,6 @@ msgstr "Pakken prøver å skrive til avledningsmålet %s/%s"
 msgid "The diversion path is too long"
 msgstr "Avledningsstien er for lang"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1890,30 +2279,36 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
 msgid "Unable to stat %s"
 msgstr "Klarte ikke å få statusen på %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode ble startet på et knutepunkt som ennå er lenket"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Klarte ikke å lukke fila %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Fant ikke nøkkelelementet."
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Klarte ikke å tildele avledning"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Intern feil i AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Intern feil, fant ikke medlemmet %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dobbel tillegging av avledning %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Kontrollfila kan ikke tolkes"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Dobbel oppsettsfil %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1961,199 +2356,52 @@ msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjent TAR-hode: type %u, medlem %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Kjører dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Pakkesystemet «%s» støttes ikke"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Klarer ikke bestemme en passende pakkesystemtype"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Skrev %i poster.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Skrev %i poster med %i manglende filer.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Skrev %i poster med %i feile filer.\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Intern feil, fant ikke medlemmet %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Kontrollfila kan ikke tolkes"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hashsummen stemmer ikke for: %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/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"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Kan ikke lese kildlista."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Tomt pakkelager"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Pakkens lagerfil er ødelagt"
-
-#: 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:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Pakkens lagerfil er ødelagt"
+msgid "List directory %spartial is missing."
+msgstr "Listemappa %spartial mangler."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Denne APT støtter ikke versjonssystemet «%s»"
-
-#: 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:321
-msgid "Depends"
-msgstr "Avhenger av"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Forutsetter"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Foreslår"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Anbefaler"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Er i konflikt med"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Erstatter"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Nuller"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Ødelegger"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Forbedrer"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "viktig"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "påkrevet"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "vanlig"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "valgfri"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "tillegg"
+msgid "Archives directory %spartial is missing."
+msgstr "Arkivmappa %spartial mangler."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finner ikke metode-driveren %s."
+msgid "Unable to lock directory %s"
+msgstr "Klarte ikke låse mappa %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startet ikke korrekt"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Oversiktsfil av typen «%s» støttes ikke"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikke å åpne StateFile %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Henter fil %li av %li (%s gjenværende)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikke å skrive midlertidig StateFile %s"
+msgid "Retrieving file %li of %li"
+msgstr "Henter fil %li av %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2173,36 +2421,36 @@ msgstr "Feil størrelse"
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2212,12 +2460,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:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-feil: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2226,176 +2474,127 @@ 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, 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/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Lageret har et uoverensstemmende versjonssystem"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Finner ikke metode-driveren %s."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil oppsto under behandling av %s (FindPkg)"
-
-#: 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: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: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: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."
+msgid "Is the package %s installed?"
+msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startet ikke korrekt"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
+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/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/algorithms.cc:265
+#, 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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samler inn filtilbud"
+#: 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kan ikke skrive til %s"
+#: 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/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO-feil ved lagring av kildekode-lager"
+#: 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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk"
+#: 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"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listemappa %spartial mangler."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Kan ikke lese kildlista."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkivmappa %spartial mangler."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Utgave «%s» av «%s» ble ikke funnet"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Klarte ikke låse mappa %s"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versjon «%s» av «%s» ble ikke funnet"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Henter fil %li av %li (%s gjenværende)"
+msgid "Couldn't find task '%s'"
+msgstr "Klarte ikke å finne oppgave «%s»"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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. "
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Klarte ikke finne noen pakken med regex «%s»"
 
-#: 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/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/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Klarer ikke finne informasjonom %s."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
+"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
+"har ingen av dem"
 
-#: 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
+#: apt-pkg/cacheset.cc:647
 #, 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"
+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/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 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:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Klarte ikke åpne fila «%s»"
+"Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen "
+"kandidat"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er "
+"installert"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2479,54 +2678,86 @@ msgstr "Skriver ny kildeliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Kildelisteoppføringer for denne CD-en er:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Klarer ikke finne informasjonom %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Skaper oversikt over avhengighetsforhold"
 
-#: 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/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 "Failed to open StateFile %s"
+msgstr "Klarte ikke å åpne StateFile %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikke å skrive midlertidig StateFile %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Klarer ikke å fortolke pakkefila %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Klarer ikke å fortolke pakkefila %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Skrev %i poster med %i manglende filer.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Skrev %i poster med %i feile filer.\n"
+
+#: 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 "Skrev %i poster med %i manglende filer og %i feile filer.\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hashsummen stemmer ikke for: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2553,6 +2784,215 @@ msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Pakkesystemet «%s» støttes ikke"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Klarer ikke bestemme en passende pakkesystemtype"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Kjører dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Klarte ikke åpne fila «%s»"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Tomt pakkelager"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Pakkens lagerfil er ødelagt"
+
+#: 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:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Pakkens lagerfil er ødelagt"
+
+#: 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:179
+msgid "The package cache was built for a different architecture"
+msgstr "Pakkelageret ble bygd for en annen arkitektur"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Avhenger av"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Forutsetter"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Foreslår"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Anbefaler"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Er i konflikt med"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Erstatter"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Nuller"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Ødelegger"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Forbedrer"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "viktig"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "påkrevet"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "vanlig"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "valgfri"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "tillegg"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Samler inn filtilbud"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Oversiktsfil av typen «%s» støttes ikke"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2628,239 +3068,144 @@ msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
 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/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:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versjon «%s» av «%s» ble ikke funnet"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Klarte ikke å finne oppgave «%s»"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Klarte ikke finne noen pakken med regex «%s»"
-
-#: 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»"
+msgid "Unable to parse package file %s (1)"
+msgstr "Klarer ikke å fortolke pakkefila %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Klarer ikke å fortolke pakkefila %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
-"har ingen av dem"
+"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
+"ble brukt isteden. "
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Klarer ikke å fastsette monteringspunktet %s"
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Klarer ikke å få statusen på CD-spilleren"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "Installerer %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "Setter opp %s"
+msgid "Command line option %s is not understood"
+msgstr "Skjønner ikke kommandolinjevalget %s"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "Fjerner %s"
+msgid "Command line option %s is not boolean"
+msgstr "Kommandolinjevalget %s er ikke boolsk"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "Fjerner %s fullstendig"
+msgid "Option %s requires an argument."
+msgstr "Valget %s krever et argument."
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Legger merke til at %s forsvinner"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =<verdi>."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Kjører etter-installasjonsutløser %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Valget %s må ha et heltallsargument, ikke «%s»"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Mappa «%s» mangler"
+msgid "Option '%s' is too long"
+msgstr "Valget «%s» er for langt"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Klarte ikke åpne fila «%s»"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Skjønner ikke %s. Prøv «true» eller «false»."
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "Forbereder %s"
+msgid "Invalid operation %s"
+msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "Pakker ut %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Ukjent typeforkortelse: «%c»"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Forbereder oppsett av %s"
+msgid "Opening configuration file %s"
+msgstr "Ã…pner oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "Installerte %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaksfeil %s:%u: Blokka starter uten navn."
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Forbereder fjerning av %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaksfeil %s:%u: Feil på taggen"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "Fjernet %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Forbereder å fullstendig slette %s"
+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/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "Fjernet %s fullstendig"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "avhengighetsproblemer - lar den være uoppsatt"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
-"følgefeil fra en tidligere feil."
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
-"feil"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
-"minne»-feil"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
-"feil"
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-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"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Syntaksfeil %s:%u: For mange nøstede inkluderte filer"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Klarte ikke låse den administrative mappen (%s). Bruker en annen prosess den?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaksfeil %s:%u: Inkludert herfra"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, 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?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikke støttet"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, 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,"
+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/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Ikke låst"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2975,54 +3320,11 @@ msgstr "Problem ved oppheving av lenke til fila %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Fant ikke utvalget %s"
+msgid "No keyring installed in %s."
+msgstr "Ingen nøkkelring installert i %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3080,521 +3382,230 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøkkelring installert i %s."
+msgid "%c%s... Error!"
+msgstr "%c%s ... Feil"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)."
+msgid "%c%s... Done"
+msgstr "%c%s ... Ferdig"
 
-#: 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/progress.cc:181
+msgid "..."
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:168
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Kommandolinjevalget %s er ikke boolsk"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s ... Ferdig"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Valget %s krever et argument."
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lit %lim %lis"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =<verdi>."
+msgid "%lih %limin %lis"
+msgstr "%lit %lim %lis"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Valget %s må ha et heltallsargument, ikke «%s»"
+msgid "%limin %lis"
+msgstr "%lim %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Valget «%s» er for langt"
+msgid "%lis"
+msgstr "%lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Skjønner ikke %s. Prøv «true» eller «false»."
+msgid "Selection %s not found"
+msgstr "Fant ikke utvalget %s"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Lista over pakkeutvidelser er for lang"
+"Klarte ikke låse den administrative mappen (%s). Bruker en annen prosess den?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Feil ved lesing av katalogen %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista over kildeutvidelser er for lang"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Feil ved skriving av topptekst til innholdsfila"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Det oppsto en feil ved lesing av %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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:841
-msgid "No selections matched"
-msgstr "Ingen utvalg passet"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Enkelte filer mangler i pakkegruppa «%s»"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Databasen er gammel, forsøker å oppgradere %s"
+"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,"
 
-#: ftparchive/cachedb.cc:94
-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."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Ikke låst"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Klarte ikke å åpne Databasefila %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Klarte ikke å lese lenken %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen kontrollpost"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Klarte ikke å finne en peker"
+msgid "Installing %s"
+msgstr "Installerer %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Klarte ikke å lese katalogen %s\n"
+msgid "Configuring %s"
+msgstr "Setter opp %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, 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"
+msgid "Removing %s"
+msgstr "Fjerner %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:98
 #, 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"
+msgid "Completely removing %s"
+msgstr "Fjerner %s fullstendig"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "Klarte ikke å åpne %s"
+msgid "Noting disappearance of %s"
+msgstr "Legger merke til at %s forsvinner"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "Kjører etter-installasjonsutløser %s"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Klarte ikke å lese lenken %s"
+msgid "Directory '%s' missing"
+msgstr "Mappa «%s» mangler"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Klarte ikke å oppheve lenken %s"
+msgid "Could not open file '%s'"
+msgstr "Klarte ikke åpne fila «%s»"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Klarte ikke å lenke %s til %s"
+msgid "Preparing %s"
+msgstr "Forbereder %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-grensa på %s B er nådd.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arkivet har ikke noe pakkefelt"
+msgid "Unpacking %s"
+msgstr "Pakker ut %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen overstyringsoppføring\n"
+msgid "Preparing to configure %s"
+msgstr "Forbereder oppsett av %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " %s-vedlikeholderen er %s, ikke %s\n"
+msgid "Installed %s"
+msgstr "Installerte %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen kildeoverstyringsoppføring\n"
+msgid "Preparing for removal of %s"
+msgstr "Forbereder fjerning av %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Klarte ikke å tildele minne"
+msgid "Removed %s"
+msgstr "Fjernet %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "Forbereder å fullstendig slette %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "Fjernet %s fullstendig"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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»"
+msgid "Can not write log (%s)"
+msgstr "Kan ikke skrive til %s"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimert utdata %s trenger et komprimeringssett"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Klarte ikke å opprette FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Klarte ikke å forgreine prosess"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimer barneprosess"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Intern feil, klarte ikke å opprette %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "avhengighetsproblemer - lar den være uoppsatt"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Klarte ikke å kommunisere med underprosess/fil"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
+"følgefeil fra en tidligere feil."
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Klarte ikke å lese under utregning av MD5"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
+"feil"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem ved oppheving av lenken til %s"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
+"minne»-feil"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 #, 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 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"
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
+"feil"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «dpkg I/O»-feil"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Intern feil - «AllUpgrade» ødela noe"
 
 #~ 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 34d653b48..08de0f8ef 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -99,75 +99,75 @@ msgstr "को लागि कूल खाली ठाऊà¤� लेखांà
 msgid "Package file %s is out of sync."
 msgstr "प�याकेज फाइल %s sync भन�दा बाहिर छ ।"
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "तपाई�ले �उटा वास�तविक बान�की दिन�पर�छ"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "प�याकेज %s तोक�न असक�षम भयो"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "प�याकेज फाइलहरू:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "पिन गरि�का प�याकेजहरू:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(फेला परेन)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  स�थापना भयो:"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  उमेद�वार:"
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(क�नै पनि होइन)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "प�याकेज पिन:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  संस�करण तालिका:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -330,7 +330,7 @@ msgid "Couldn't find package %s"
 msgstr "प�याकेज फेला पार�न सकि�न  %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "तर %s स�थापना ह�न�पर�यो"
@@ -358,7 +358,7 @@ msgstr "डाउनलोड डाइरेकà¥�टà¥�री तालà¥�चà
 msgid "Must specify at least one package to fetch source for"
 msgstr "को लागि स�रोत तान�न कम�तिमा �उटा प�याकेज निर�दिष�ट गर�न�पर�छ"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s को लागि स�रोत प�याकेज फेला पार�न असफल भयो"
@@ -384,7 +384,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "पहिल�यै डाउनलोड भ�का फाइलहर� फड�काइदैछ '%s'\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr " %s मा खाली ठाऊ� निर�धारण गर�न सकि�न"
@@ -417,7 +417,7 @@ msgstr "स�रोत फड�काउन�होस� %s\n"
 msgid "Failed to fetch some archives."
 msgstr "केही संग�रह फड�काउन असफल भयो ।"
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "डाउनलोड समाप�त भयो र डाउनलोडमा मोड मात�रै छ"
 
@@ -426,66 +426,66 @@ msgstr "डाउनलोड समापà¥�त भयो र डाउनलà¥
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s मा पहिल�यै अनप�याक गरि�का स�रोतको अनप�याक फड�काइदैछ\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "अनप�याक आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "जा�च�न�होस� यदि 'dpkg-dev' प�याकेज स�थापना भयो ।\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "निर�माण आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "शाखा प�रक�रिया असफल भयो"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr "को लागि builddeps जा�च�न कम�तिमा �उटा प�याकेज निर�दष�ट गर�न�पर�छ"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s को लागि निर�माण-निर�भरता सूचना प�राप�त गर�न असक�षम भयो"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s क�नै निर�माणमा आधारित ह�दैन ।\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, 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:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s को लागि %s निर�भरता सन�त�ष�ट पार�न असफल भयो: स�थापित प�याकेज %s अति नया� छ"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -494,37 +494,37 @@ msgstr ""
 "%sको लागि %s निर�भरता सन�त�ष�ट ह�न सकेन किन भने प�याकेज %s को क�नै उपलब�ध संस�करणले संस�करण "
 "आवश�यकताहर�लाई सन�त�ष�ट पार�न सकेन "
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, 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:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s को लागि %s निर�भरता सन�त�ष�ट गर�न असफल: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s को लागि निर�माण निर�भरताहरू सन�त�ष�ट गर�न सकि�न । "
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "निर�माण निर�भरताहरू प�रक�रिया गर�न असफल"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) मा जडान गरिदैछ"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "समर�थित मोड�य�लहरू:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -609,16 +609,20 @@ msgstr ""
 "pages हेर�न�होस� ।\n"
 "                       APT संग स�पर काउ शक�तिहरू छ ।\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "को लागि स�रोत तान�न कम�तिमा �उटा प�याकेज निर�दिष�ट गर�न�पर�छ"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -627,6 +631,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -656,8 +661,9 @@ msgstr "%s पहिल�यै नया� संस�करण हो ।\n
 msgid "%s was already not hold.\n"
 msgstr "%s पहिल�यै नया� संस�करण हो ।\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr " %s को लागि पर�खिरहेको तर यो त�यहा� छैन"
@@ -851,7 +857,7 @@ msgstr "à¤�उटा सकेट सिरà¥�जना गरà¥�न सकेà¤
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सकेट जडान गर�न सकि�न, जडान समय सकियो"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "असफल भयो"
 
@@ -897,7 +903,7 @@ msgstr "डेटा सकेटको जडान समय सकियो"
 msgid "Unable to accept connection"
 msgstr "जडान स�वीकार गर�न असक�षम भयो"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "समस�या द�र�तान�वेषण फाइल"
 
@@ -1026,142 +1032,229 @@ msgstr "निम�न हस�ताक�षरहरू रूजू ह�
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "फाइलमा त�र�टि लेखिदैछ"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर�भरबाट त�र�टि पढिदैछ । दूर गन�तब�य बन�द जडान"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "सर�भरबाट त�र�टि पढिदैछ"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "फाइलमा त�र�टि लेखिदैछ"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "असफल चयन गर�न�होस�"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "जडान समय सकियो"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "निर�गात फाइलमा त�र�टि लेखिदैछ"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "हेडरहर�को लागि पर�खिदैछ"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "खराब हेडर लाइन"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर�भरले अवैध जवाफ हेडर पठायो"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर�भरले अवैध सामग�री-लम�बाई हेडर पठायो"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर�भरले अवैध सामग�री-दायरा हेडर पठायो"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर�भर संग भा�चि�को दायरा समर�थन छ"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "अज�ञात मिति ढा�चा"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "आन�तरिक त�र�टि"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "हान�न�होस�"
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "प�राप�त गर�न�होस�:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [काम गरिरहेको]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"मेडिया परिवर�तन: कृपया डिस�क लेब�ल ड�राइभ '%s' मा घ�साउन�होस�\n"
+" '%s'\n"
+"र इन�टर थिच�न�होस�\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "चेतावनी: निम�न प�याकलेजहरू प�रणाणीकरण ह�न सक�दैन! "
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "प�रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "केही प�याकेजहरू प�रमाणीकरण ह�न सक�दैन"
+
+#: apt-private/private-download.cc:50
+#, fuzzy
+msgid "Install these packages without verification?"
+msgstr "यी प�याकेजहरू रूजू बिना स�थापना गर�न�ह�न�छ [y/N]? "
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "त�यहा� समस�याहरू छन� र ह�न�छलाई जोड नगरिकन -y को प�रयोग भयो"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "%s  %s तान�न असफल भयो\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन�तरिक त�र�टि, स�थापना प�याकेजहर�लाई भा�चि�को प�याकेज भनिन�थ�यो!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "प�याकेजहरू हट�न चाहदैछन� तर हटाई अक�षम भइरहेछ ।"
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "आन�तरिक त�र�टि, आदेश समाप�त भ�को छैन"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB अनप�याक गरिसके पछि डिस�क खाली ठाउ� खाली ह�नेछ ।\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "तपाई� संग %s मा पर�याप�त खाली ठाऊ� छैन ।"
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "त�यहा� समस�याहरू छन� र ह�न�छलाई जोड नगरिकन -y को प�रयोग भयो"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "हो,मैले भने जस�तै गर�न�होस�!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1172,20 +1265,20 @@ msgstr ""
 "निरन�तरता दिन '%s' वाक�यांशमा टाइप गर�न�होस� \n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "परित�याग गर�न�होस� ।"
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "के तपाई� निरन�तरता दिन चाहन�ह�न�छ [Y/n]? "
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "केही फाइलहरू डाउनलोड गर�न असफल भयो"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1193,19 +1286,19 @@ msgstr ""
 "केही संग�रहहरू तान�न असक�षम भयो,apt-get अद�यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प�रयास "
 "गर�न�ह�न�छ ?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "हराइरहेको --fix-र स�वाप भइरहेको मेडिया हाल समर�थित भइरहेको छैन"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "हराइरहेको प�याकेजहरू स�धार�न असक�षम भयो ।"
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "स�थापना परित�याग गरिदैछ ।"
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1215,15 +1308,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1239,16 +1332,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "निम�न सूचनाले अवस�थालाई हल गर�न मद�दत गर�नेछ: "
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "आन�तरिक त�र�टि,समस�या हलकर�ताले उत�तम ग�ण भा�च�यो "
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1258,7 +1351,7 @@ msgid_plural ""
 msgstr[0] "निम�न नया� प�याकेजहरू स�थापना ह�नेछन�:"
 msgstr[1] "निम�न नया� प�याकेजहरू स�थापना ह�नेछन�:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1266,7 +1359,7 @@ msgid_plural ""
 msgstr[0] "निम�न नया� प�याकेजहरू स�थापना ह�नेछन�:"
 msgstr[1] "निम�न नया� प�याकेजहरू स�थापना ह�नेछन�:"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
@@ -1284,7 +1377,7 @@ msgstr ""
 "नभेटि�का निर�भरताहरू । प�याकेजहरू बिना 'apt-get -f install' प�रयास गर�न�होस� ( वा "
 "समाधान निर�दिष�ट गर�न�होस�) ।"
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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,68 +1390,68 @@ msgstr ""
 " वितरण अहिले सम�म सिर�जना\n"
 " भ�को छैन वा आवगमन विनानै सर�यो ।"
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "भा�चि�का प�याकेजहरू"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "निम�न अतिरिक�त प�याकेजहरू स�थापना ह�नेछन�:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "स��ाव दि�का प�याकेजहरू:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "सिफारिस गरि�का प�याकेजहरू:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s फड�किदैछ, यो पहिल�यै स�थापना भयो र स�तरवृद�धि सेट भ�को छैन ।\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s फड�किदैछ, यो पहिल�यै स�थापना भयो र स�तरवृद�धि सेट भ�को छैन ।\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr " %s को प�न: स�थापना सम�भव छैन, यो डाउनलोड ह�न सक�दैन ।\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s पहिल�यै नया� संस�करण हो ।\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "%s को लागि चयन भ�को संस�करण %s (%s)\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "%s को लागि चयन भ�को संस�करण %s (%s)\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "प�याकेज %s स�थापना भ�न, त�यसैले हटेन\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "प�याकेज %s स�थापना भ�न, त�यसैले हटेन\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1366,136 +1459,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [स�थापना भयो]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [स�थापना भयो]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [स�थापना भयो]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [स�थापना भयो]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "निम�न प�याकेजहर�ले निर�भरताहरू भेटेनन�:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "तर %s स�थापना भयो"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "तर %s स�थापना ह�न�पर�यो"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "तर यो स�थापनायोग�य छैन"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "तर यो अवास�तविक प�याकेज होइन"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "तर यो स�थापना भ�न"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "तर यो स�थापना ह�न गइरहेको छैन"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr "वा"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "निम�न प�याकेजहर�ले निर�भरताहरू भेटेनन�:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "निम�न नया� प�याकेजहरू स�थापना ह�नेछन�:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "निम�न प�याकेजहरू हटाइनेछन�:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "निम�न प�याकेजहरू पछाडि राखिनेछन�:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "निम�न प�याकेजहरू स�तर वृद�धि ह�नेछन�:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "निम�न प�याकेजहरू स�तरकम गरिनेछन�:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "निम�न भइरहेको प�याकेजहरू परिवर�तन ह�नेछैन:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s कारणले) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1503,27 +1576,27 @@ msgstr ""
 "चेतावनी: निम�न आवश�यक प�याकेजहरू हटाइनेछन� ।\n"
 "तपाई� के गरिरहेको यकिन नभ�सम�म यो काम गरिने छैन!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu स�तर वृद�धि गरियो, %lu नया� स�थापना भयो, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu प�न: स�थापना गरियो, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu स�तर कम गरियो, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu हटाउन र %lu स�तर वृद�धि गरि�न ।\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu पूर�णर�पले स�थापना भ�न र हटाइ�न ।\n"
@@ -1532,7 +1605,7 @@ msgstr "%lu पूरà¥�णरà¥�पले सà¥�थापना भà¤�न र à
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1540,36 +1613,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1583,36 +1648,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "चेतावनी: निम�न प�याकलेजहरू प�रणाणीकरण ह�न सक�दैन! "
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "प�रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "केही प�याकेजहरू प�रमाणीकरण ह�न सक�दैन"
-
-#: apt-private/private-download.cc:50
-#, fuzzy
-msgid "Install these packages without verification?"
-msgstr "यी प�याकेजहरू रूजू बिना स�थापना गर�न�ह�न�छ [y/N]? "
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s  %s तान�न असफल भयो\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1623,74 +1658,44 @@ msgstr " %s मा  %s  प�न:नामकरण असफल भयो"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "अद�यावधिक आदेशले क�नै तर�कहरू लिदैन"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "काम भयो"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "हान�न�होस�"
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "प�राप�त गर�न�होस�:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [काम गरिरहेको]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"मेडिया परिवर�तन: कृपया डिस�क लेब�ल ड�राइभ '%s' मा घ�साउन�होस�\n"
-" '%s'\n"
-"र इन�टर थिच�न�होस�\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s पढ�न असफल भयो"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1766,36 +1771,428 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब�ध सूचना गा�भिदैछ"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "ह�यास तत�व तोक�न असफल भयो"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s स�थिर गर�न असक�षम भयो"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "मोड बा�ड�न असफल भयो"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %s मा लेख�न असक�षम"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "थपमोडमा आन�तरिक त�र�टि"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr " debconf संस�करण प�राप�त गर�न सकि�न । के debconf स�थापना भयो ? "
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "प�याकेज विस�तार सूचि अति लामो छ"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "मोड अधिलेखन गर�ने प�यास गरिदै, %s -> %s र %s/%s"
+msgid "Error processing directory %s"
+msgstr "डाइरेक�ट�री %s प�रक�रिया गर�दा त�र�टि"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "स�रोत विस�तार सूचि अति लामो छ"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "सामाग�री फाइलहर�मा हेडर लेख�दा त�र�टि"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "मोडको डबल थप %s -> %s"
+msgid "Error processing contents %s"
+msgstr "सामग�री %sप�रक�रिया गर�दा त�र�टि"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "क�नै चयनहरू मेल खा�न"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "नक�कली कनफिगगरेसन फाइल %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "केही फाइलहरू प�याकेज फाइल समूह `%s' मा हराइरहेको छ"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB दूषित थियो, फाइल %s.प�रानो मा प�न:नामकरण गर�न�होस�"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB प�रानो छ, %s स�तरवृद�धि गर�न प�रयास गरिदैछ"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB फाइल %s असक�षम भयो: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr " %s स�थिर गर�न असफल"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "लिङ�क पढ�न असफल %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "संग�रह संग नियन�त�रण रेकर�ड छैन"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "संग�रह संग क�नै प�याकेज फा�ट छैन"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "   %s संग क�नै अधिलेखन प�रविष�टि छैन\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s संभारकर�ता %s हो %s होइन\n"
+
+#: ftparchive/writer.cc:706
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "   %s संग क�नै अधिलेखन प�रविष�टि छैन\n"
+
+#: ftparchive/writer.cc:710
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "   %s संग क�नै अधिलेखन प�रविष�टि छैन\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr " %s मा  %s  प�न:नामकरण असफल भयो"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1821,17 +2218,6 @@ msgstr "प�याकेज लक�षित मोडमा लेख�न
 msgid "The diversion path is too long"
 msgstr "घ�म�ती बाटो अति लामो छ"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1860,30 +2246,36 @@ msgstr "फाइल %s/%s ले पà¥�याकेज %s मा à¤�उटा à
 msgid "Unable to stat %s"
 msgstr "%s स�थिर गर�न असक�षम भयो"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "अहिलेसम�म लिङ�क गरि�को नोडमा बोलाइ�को ड�रपनोड"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s फाइल बन�द गर�न असफल भयो"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "ह�यास तत�व तोक�न असफल भयो"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "मोड बा�ड�न असफल भयो"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "थपमोडमा आन�तरिक त�र�टि"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "यो वैध DEB संग�रह होइन, '%s' सदस�य हराइरहेछ"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "मोड अधिलेखन गर�ने प�यास गरिदै, %s -> %s र %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "आन�तरीक त�र�टि, सदस�य तोक�न सक�दैन  %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "मोडको डबल थप %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "पद वर�णन गर�न नसकिने नियन�त�रण फाइल"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "नक�कली कनफिगगरेसन फाइल %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1931,199 +2323,52 @@ msgstr "टार चेकसम असफल भयो, संग�रह द
 msgid "Unknown TAR header type %u, member %s"
 msgstr "अज�ञात टार हेडर प�रकार %u, सदस�य %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "प�याकिङ�ग प�रणाली '%s' समर�थित छैन"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "उपय�क�त प�याकिङ�ग प�रणाली प�रकार निर�धारन गर�न असक�षम भयो"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i रेकर�डहरू लेखियो ।\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर�डहरू लेख�न�होस� ।\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "मेल नखा�का फाइल %i हरू संगै %i रेकर�डहरू लेख�न�होस� ।\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "यो वैध DEB संग�रह होइन, '%s' सदस�य हराइरहेछ"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "हराइरहेको फाइल %i हरू र मेल नखा�का फाइल %i हरू संगै %i रेकर�डहरू लेख�न�होस� ।\n"
+msgid "Internal error, could not locate member %s"
+msgstr "आन�तरीक त�र�टि, सदस�य तोक�न सक�दैन  %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "पद वर�णन गर�न नसकिने नियन�त�रण फाइल"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "MD5Sum मेल भ�न"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "प�याकेज सूचीहरू वा वस�त�स�थिति फाइल पद वर�णन गर�न वा खोल�न सकि�न ।"
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "यो समस�याहरू स�धार�न तपाई� apt-get अद�यावधिक चलाउन चाहन�ह�न�छ"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "स�रोतहर�को सूचि पढ�न सकि�न ।"
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "खाली प�याकेज क�यास"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "प�याकेज क�यास फाइल दूषित भयो "
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "प�याकेज क�यास फाइल �उटा अमिल�दो संस�करण हो"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "प�याकेज क�यास फाइल दूषित भयो "
-
-#: apt-pkg/pkgcache.cc:174
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "यो APT ले संस�करण प�रणालीलाई समर�थन गर�दैन '%s'"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "प�याकेज क�यास विभिन�न वास�त�कलाको लागि निर�माण भ�को हो"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "आधारित"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "प�न:आधारित"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "स��ाव दिन�छ"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "सिफारिस गर�दछ"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "द�वन�दहरू"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "बदल�छ"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "वेकायमहरू"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "महत�वपूर�ण"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "आवश�यक"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "मानक"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "वैकल�पिक"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "अतिरिक�त"
+msgid "List directory %spartial is missing."
+msgstr "आंशिक सूचिहर�को डाइरेक�ट�री %s हराइरहेछ ।"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "विधि ड�राइभर %s फेला पार�न सकि�न ।"
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "आंशिक संग�रह डाइरेक�ट�री %s हराइरहेछ ।"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:99
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "जा�च�न�होस� यदि 'dpkg-dev' प�याकेज स�थापना भयो ।\n"
+msgid "Unable to lock directory %s"
+msgstr "सूचि डाइरेक�ट�री ताल�चा मार�न असफल"
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "विधि %s सही र�पले स�रू ह�न सकेन"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "अन�क�रमणिका फाइल प�रकार '%s' समर�थित छैन"
 
-#: apt-pkg/acquire-worker.cc:455
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया डिस�क लेब�ल: '%s' ड�राइभ '%s'मा घ�सउन�होस� र इन�टर थिच�न�होस� । "
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li को %li फाइल प�न:प�राप�त गरिदैछ (%s बा�की छ)"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "अन�क�रमणिका फाइल प�रकार '%s' समर�थित छैन"
-
-#: 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
-#, fuzzy
-msgid "Reading state information"
-msgstr "उपलब�ध सूचना गा�भिदैछ"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-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 लेख�न असफल भयो"
+msgid "Retrieving file %li of %li"
+msgstr "%li को %li फाइल प�न:प�राप�त गरिदैछ"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2144,35 +2389,35 @@ msgstr "साइज मेल खा�न"
 msgid "Invalid file format"
 msgstr "अवैध सञ�चालन  %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "प�याकेज फाइल पद वर�णन गर�न असक�षम %s (१)"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "निम�न क�ञ�जी IDs को लागि क�नै सार�वजनिक क�ञ�जी उपलब�ध छैन:\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2180,12 +2425,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2194,174 +2439,118 @@ msgstr ""
 "%s प�याकेजको लागि मैले फाइल स�थित गर�न सकिन । यसको मतलब तपाई�ले म�यान�ल�ली यो प�याकेज "
 "निश�चित गर�न�होस� । (arch हरा�रहेको कारणले) "
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "प�याकेज अन�क�रमणिका फाइलहरू दूषित भ� । प�याकेज %s को लागि क�नै फाइलनाम: फा�ट छैन ।"
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "क�यास संग �उटा नमिल�दो संस�करण प�रणाली छ"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "विधि ड�राइभर %s फेला पार�न सकि�न ।"
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr " %s प�रक�रिया गर�दा त�र�टि देखा पर�यो (pkg फेला पार�न�होस� )"
+msgid "Is the package %s installed?"
+msgstr "जा�च�न�होस� यदि 'dpkg-dev' प�याकेज स�थापना भयो ।\n"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "वाऊ, APT ले सक�षम गरेको प�याकेज नामहर�को नम�बरलाई तपाई�ले उछिन�न�भयो । "
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "विधि %s सही र�पले स�रू ह�न सकेन"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "वाऊ, APT ले सक�षम गरेको संस�करणहर�को नम�बरलाई तपाई�ले उछिन�न�भयो । "
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया डिस�क लेब�ल: '%s' ड�राइभ '%s'मा घ�सउन�होस� र इन�टर थिच�न�होस� । "
 
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "वाऊ, APT ले सक�षम गरेको संस�करणहर�को नम�बरलाई तपाई�ले उछिन�न�भयो । "
+#: 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 "प�याकेज %s प�न:स�थापना ह�न चाहन�छ, तर यसको लागि मैले �उटा संग�रह फेला पार�न सकिन ।"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "वाऊ, APT ले सक�षम गरेको निर�भरताहर�को नम�बरलाई तपाई�ले उछिन�न�भयो । "
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"त�र�टि, pkgProblemResolver:: समाधानले विच�छेदन सिर�जना गर�दछ, यो भइरहेको प�याकेजहर�को "
+"कारणले गर�दा हो ।"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "फाइल निर�भरताहरू प�रक�रिया गर�दा प�याकेज %s %s फेला परेन"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "समस�याहरू स�धार�न असक�षम भयो, तपाई�ले प�याकेजहर� भा�च�न�भयो ।"
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "स�रोत प�याकेज सूची %s स�थिर गर�न सकि�न "
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+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 "प�याकेज सूचिहरू पढिदैछ"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "यो समस�याहरू स�धार�न तपाई� apt-get अद�यावधिक चलाउन चाहन�ह�न�छ"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "फाइल उपलब�धताहरू संकलन गरिदैछ"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "स�रोतहर�को सूचि पढ�न सकि�न ।"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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 त�र�टि"
+msgid "Release '%s' for '%s' was not found"
+msgstr " '%s' को लागि '%s' निष�काशन फेला पार�न सकि�न"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "बिक�रता ब�ल�क %s ले क�नै औठाछाप समाविष�ट गर�दैन"
+msgid "Version '%s' for '%s' was not found"
+msgstr " '%s' को लागि '%s' संस�करण फेला पार�न सकि�न"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "आंशिक सूचिहर�को डाइरेक�ट�री %s हराइरहेछ ।"
+msgid "Couldn't find task '%s'"
+msgstr "प�याकेज फेला पार�न सकि�न  %s"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "आंशिक संग�रह डाइरेक�ट�री %s हराइरहेछ ।"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "प�याकेज फेला पार�न सकि�न  %s"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr "%li को %li फाइल प�न:प�राप�त गरिदैछ (%s बा�की छ)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "प�याकेज फेला पार�न सकि�न  %s"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, 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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"केही अन�क�रमणिका फाइलहरू डाउनलोड गर�न असफल भयो, तिनीहरू उपेक�षित भ�, वा सट�टामा प�रानो "
-"�उटा प�रयोग गरियो ।"
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "तपाई�को स�रोत सूचिमा केही 'source' URIs राख�न�होस�"
-
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स�थिर गर�न असक�षम भयो ।"
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "प�राथमिकता फाइलमा अवैध रेकर�ड, क�नै प�याकेज हेडर छैन"
-
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, 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 "पिनको लागि क�नै प�राथमिकता (वा शून�य) निर�दिष�ट छैन"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "फाइल %s खोल�न सकि�न"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"द�वन�द/प�न-आधारित लूपको कारणले गर�दा स�थापना चलाउनको लागि अस�थायी र�पमा प�याकेज %s "
-"हटाउन� पर�नेछ । यो प�राय नराम�रो हो, तर यदि तपाई� यो सा�च�चै गर�न चाहन�ह�न�छ भने, APT::"
-"Force-LoopBreak विकल�प सक�रिय गर�न�होस� ।"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2442,53 +2631,87 @@ msgstr "नया� स�रोत सूचि लेखिदैछ\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "यो डिस�कको लागि स�रोत सूचि प�रविष�टिहरू:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "प�याकेज %s प�न:स�थापना ह�न चाहन�छ, तर यसको लागि मैले �उटा संग�रह फेला पार�न सकिन ।"
+msgid "Unable to stat %s."
+msgstr "%s स�थिर गर�न असक�षम भयो ।"
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"त�र�टि, pkgProblemResolver:: समाधानले विच�छेदन सिर�जना गर�दछ, यो भइरहेको प�याकेजहर�को "
-"कारणले गर�दा हो ।"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "निर�भरता ट�री निर�माण गरिदैछ"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-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
+#, fuzzy
+msgid "Reading state information"
+msgstr "उपलब�ध सूचना गा�भिदैछ"
+
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+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/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "प�याकेज फाइल पद वर�णन गर�न असक�षम %s (१)"
+msgid "Wrote %i records.\n"
+msgstr "%i रेकर�डहरू लेखियो ।\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "प�याकेज फाइल पद वर�णन गर�न असक�षम %s (२)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर�डहरू लेख�न�होस� ।\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "मेल नखा�का फाइल %i हरू संगै %i रेकर�डहरू लेख�न�होस� ।\n"
+
+#: 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 "हराइरहेको फाइल %i हरू र मेल नखा�का फाइल %i हरू संगै %i रेकर�डहरू लेख�न�होस� ।\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "MD5Sum मेल भ�न"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2515,6 +2738,214 @@ msgstr "घ�माउरो फाइलमा अवैध लाइन:%s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "प�याकेज फाइल पद वर�णन गर�न असक�षम %s (१)"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "प�याकिङ�ग प�रणाली '%s' समर�थित छैन"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "उपय�क�त प�याकिङ�ग प�रणाली प�रकार निर�धारन गर�न असक�षम भयो"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "फाइल %s खोल�न सकि�न"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "खाली प�याकेज क�यास"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "प�याकेज क�यास फाइल दूषित भयो "
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "प�याकेज क�यास फाइल �उटा अमिल�दो संस�करण हो"
+
+#: apt-pkg/pkgcache.cc:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "प�याकेज क�यास फाइल दूषित भयो "
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "यो APT ले संस�करण प�रणालीलाई समर�थन गर�दैन '%s'"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "प�याकेज क�यास विभिन�न वास�त�कलाको लागि निर�माण भ�को हो"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "आधारित"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "प�न:आधारित"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "स��ाव दिन�छ"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "सिफारिस गर�दछ"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "द�वन�दहरू"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "बदल�छ"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "वेकायमहरू"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "महत�वपूर�ण"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "आवश�यक"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "मानक"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "वैकल�पिक"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "अतिरिक�त"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "वाऊ, APT ले सक�षम गरेको प�याकेज नामहर�को नम�बरलाई तपाई�ले उछिन�न�भयो । "
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "वाऊ, APT ले सक�षम गरेको संस�करणहर�को नम�बरलाई तपाई�ले उछिन�न�भयो । "
+
+#: 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:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "वाऊ, APT ले सक�षम गरेको निर�भरताहर�को नम�बरलाई तपाई�ले उछिन�न�भयो । "
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "स�रोत प�याकेज सूची %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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "स�रोत क�यास बचत गर�दा IO त�र�टि"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "अन�क�रमणिका फाइल प�रकार '%s' समर�थित छैन"
+
+#: 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 record in the preferences file %s, no Package header"
+msgstr "प�राथमिकता फाइलमा अवैध रेकर�ड, क�नै प�याकेज हेडर छैन"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2590,221 +3021,143 @@ msgstr "सà¥�रोत सूची %s भितà¥�र %u लाइनमा à¤
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "स�रोत सूची %s भित�र %u लाइनमा टाइप '%s' ज�ञात छैन"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr " '%s' को लागि '%s' निष�काशन फेला पार�न सकि�न"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "तपाई�को स�रोत सूचिमा केही 'source' URIs राख�न�होस�"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr " '%s' को लागि '%s' संस�करण फेला पार�न सकि�न"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "प�याकेज फेला पार�न सकि�न  %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "प�याकेज फेला पार�न सकि�न  %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "प�याकेज फेला पार�न सकि�न  %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "प�याकेज फाइल पद वर�णन गर�न असक�षम %s (१)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "प�याकेज फाइल पद वर�णन गर�न असक�षम %s (२)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 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"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
+"केही अन�क�रमणिका फाइलहरू डाउनलोड गर�न असफल भयो, तिनीहरू उपेक�षित भ�, वा सट�टामा प�रानो "
+"�उटा प�रयोग गरियो ।"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "बिक�रता ब�ल�क %s ले क�नै औठाछाप समाविष�ट गर�दैन"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "माउन�ट बिन�द� %s स�थिर गर�न असक�षम"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr " %s स�थापना भयो"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "सिडी रोम स�थिर गर�न असफल भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr " %s कनफिगर गरिदैछ"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "आदेश लाइन विकल�प '%c' [%s बाट] ज�ञात छैन ।"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr " %s हटाइदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr " %s पूर�ण र�पले हट�यो"
+msgid "Command line option %s is not understood"
+msgstr "आदेश लाइन विकल�प %s ब��ि�न"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Command line option %s is not boolean"
+msgstr "आदेश लाइन विकल�प %s बूलियन छैन"
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "आंशिक सूचिहर�को डाइरेक�ट�री %s हराइरहेछ ।"
-
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "फाइल %s खोल�न सकि�न"
+msgid "Option %s requires an argument."
+msgstr "विकल�प %s लाई �उटा तर�कको आवश�यकता पर�दछ ।"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Preparing %s"
-msgstr " %s तयार गरिदैछ"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "विकल�प %s: कनफिगरेसन वस�त� विशिष�टिकरण संग �उटा =<val> ह�न�पर�छ ।"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Unpacking %s"
-msgstr " %s अनप�याक गरिदैछ"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "विकल�प  %s लाई �उटा इन�टिजर तर�कको आवश�यक पर�दछ, '%s' होइन"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Preparing to configure %s"
-msgstr " %s कनफिगर गर�न तयार गरिदैछ"
+msgid "Option '%s' is too long"
+msgstr "विकल�प '%s' अति लामो छ"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Installed %s"
-msgstr " %s स�थापना भयो"
+msgid "Sense %s is not understood, try true or false."
+msgstr "अर�थ %s ब��ि�न, सत�य वा �ूठो प�रयास गर�न�होस� ।"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr " %s हटाउन तयार गरिदैछ"
+msgid "Invalid operation %s"
+msgstr "अवैध सञ�चालन  %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Removed %s"
-msgstr " %s हट�यो"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "नचिनि�को टाइप संक�षिप�त र�प: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr " %s पूर�ण र�पले हटाउन तयार गरिदैछ"
+msgid "Opening configuration file %s"
+msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Completely removed %s"
-msgstr " %s पूर�ण र�पले हट�यो"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "वाक�य संरचना त�र�टि %s:%u: बन�द क�नै नाम बिना स�रू ह�न�छ ।"
 
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "वाक�य संरचना त�र�टि %s:%u: वैर�प गरि�को ट�याग"
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "वाक�य संरचना त�र�टि %s:%u: मान पछाडि अतिरिक�त जंक"
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "वाक�य संरचना त�र�टि %s:%u: अति धेरै नेस�टेड समावेश गर�दछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "वाक�य संरचना त�र�टि %s:%u: समर�थन नभ�को डाइरेक�टिभ '%s'"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "सूचि डाइरेक�ट�री ताल�चा मार�न असफल"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "वाक�य संरचना त�र�टि %s:%u: निर�देशनहरू माथिल�लो तहबाट मात�र ह�न�छ"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "वाक�य संरचना त�र�टि %s:%u:फाइलको अन�त�यमा अतिरिक�त जंक"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2919,54 +3272,11 @@ msgstr "फाइल अनलिङ�क गर�दा समस�या"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... गरियो"
-
-#. 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 फेला पार�न सकि�न"
+msgid "No keyring installed in %s."
+msgstr "स�थापना परित�याग गरिदैछ ।"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3021,518 +3331,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "वाक�य संरचना त�र�टि %s:%u: यहा� बाट समावेश गरेको"
+msgid "%c%s... Error!"
+msgstr "%c%s... त�र�टि!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, 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: निर�देशनहरू माथिल�लो तहबाट मात�र ह�न�छ"
+msgid "%c%s... Done"
+msgstr "%c%s... गरियो"
 
-#: apt-pkg/contrib/configuration.cc:950
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "वाक�य संरचना त�र�टि %s:%u:फाइलको अन�त�यमा अतिरिक�त जंक"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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 बूलियन छैन"
+msgid "%c%s... %u%%"
+msgstr "%c%s... गरियो"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "विकल�प %s लाई �उटा तर�कको आवश�यकता पर�दछ ।"
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "विकल�प %s: कनफिगरेसन वस�त� विशिष�टिकरण संग �उटा =<val> ह�न�पर�छ ।"
+msgid "%lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "विकल�प  %s लाई �उटा इन�टिजर तर�कको आवश�यक पर�दछ, '%s' होइन"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "विकल�प '%s' अति लामो छ"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "अर�थ %s ब��ि�न, सत�य वा �ूठो प�रयास गर�न�होस� ।"
+msgid "Selection %s not found"
+msgstr "चयन %s फेला पार�न सकि�न"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "प�याकेज विस�तार सूचि अति लामो छ"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "डाइरेक�ट�री %s प�रक�रिया गर�दा त�र�टि"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "स�रोत विस�तार सूचि अति लामो छ"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "सामाग�री फाइलहर�मा हेडर लेख�दा त�र�टि"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "सूचि डाइरेक�ट�री ताल�चा मार�न असफल"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "सामग�री %sप�रक�रिया गर�दा त�र�टि"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "क�नै चयनहरू मेल खा�न"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "केही फाइलहरू प�याकेज फाइल समूह `%s' मा हराइरहेको छ"
 
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB दूषित थियो, फाइल %s.प�रानो मा प�न:नामकरण गर�न�होस�"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB प�रानो छ, %s स�तरवृद�धि गर�न प�रयास गरिदैछ"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "DB फाइल %s असक�षम भयो: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "लिङ�क पढ�न असफल %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "संग�रह संग नियन�त�रण रेकर�ड छैन"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "कर�सर प�राप�त गर�न असक�षम भयो"
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr " %s स�थापना भयो"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: डाइरेक�ट�री %s पढ�न असक�षम\n"
+msgid "Configuring %s"
+msgstr " %s कनफिगर गरिदैछ"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, 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: "
+msgid "Removing %s"
+msgstr " %s हटाइदैछ"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: फाइलमा त�र�टिहरू लागू गर�न�होस�"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr " %s पूर�ण र�पले हट�यो"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "%s हल गर�न असफल भयो"
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "ट�री हिडाई� असफल भयो"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s खोल�न असफल"
+msgid "Running post-installation trigger %s"
+msgstr ""
 
-#: ftparchive/writer.cc:278
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "आंशिक सूचिहर�को डाइरेक�ट�री %s हराइरहेछ ।"
 
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "लिङ�क पढ�न असफल %s"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "फाइल %s खोल�न सकि�न"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "अनलिङ�क गर�न असफल %s"
+msgid "Preparing %s"
+msgstr " %s तयार गरिदैछ"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s मा %s लिङ�क असफल भयो"
+msgid "Unpacking %s"
+msgstr " %s अनप�याक गरिदैछ"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "यस %sB हिटको डि लिङ�क सिमा।\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "संग�रह संग क�नै प�याकेज फा�ट छैन"
+msgid "Preparing to configure %s"
+msgstr " %s कनफिगर गर�न तयार गरिदैछ"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "   %s संग क�नै अधिलेखन प�रविष�टि छैन\n"
+msgid "Installed %s"
+msgstr " %s स�थापना भयो"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s संभारकर�ता %s हो %s होइन\n"
-
-#: ftparchive/writer.cc:706
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "   %s संग क�नै अधिलेखन प�रविष�टि छैन\n"
-
-#: ftparchive/writer.cc:710
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "   %s संग क�नै अधिलेखन प�रविष�टि छैन\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - स�मृति बा�डफा�ड गर�न असफल भयो"
+msgid "Preparing for removal of %s"
+msgstr " %s हटाउन तयार गरिदैछ"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, 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 #१"
+msgid "Removed %s"
+msgstr " %s हट�यो"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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 #३"
+msgid "Preparing to completely remove %s"
+msgstr " %s पूर�ण र�पले हटाउन तयार गरिदैछ"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "अज�ञात सङ�क�चन अल�गोरिद�म '%s'"
+msgid "Completely removed %s"
+msgstr " %s पूर�ण र�पले हट�यो"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "सङ�क�चन गरि�को निर�गात %s लाई सङ�क�चन सेटको आवश�यक�ता पर�दछ"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr " %s मा लेख�न असक�षम"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE* सिर�जना गर�न असफल"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "का�टा गर�न असफल"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "सङ�क�चन शाखा"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "आन�तरीक त�र�टि, %s सिर�जना गर�न असफल"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "सहायक प�रक�रिया/फाइलमा IO असफल भयो"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5 गणना गर�दा पढ�न असफल भयो"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "समस�या अनलिङ�क भइरहेछ %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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 "अज�ञात प�याकेज रेकर�ड!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "आन�तरिक त�र�टि,सबै स�तरवृद�धिले उत�तम ग�ण नष�ट गर�दछ"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s वैध DEB प�याकेज होइन"
diff --git a/po/nl.po b/po/nl.po
index fc558973d..c410baa46 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -100,74 +100,74 @@ msgstr "Totale hoeveelheid verantwoorde ruimte: "
 msgid "Package file %s is out of sync."
 msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "U dient precies één zoekpatroon op te geven"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kan pakket %s niet vinden"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Pakketbestanden:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Vastgepinde pakketten:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(niet gevonden)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Geïnstalleerd: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Kandidaat: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(geen)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Pakketpin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Versietabel:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -332,7 +332,7 @@ msgid "Couldn't find package %s"
 msgstr "Kon pakket %s niet vinden"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
@@ -362,7 +362,7 @@ msgstr ""
 "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
 "worden"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kan geen bronpakket vinden voor %s"
@@ -395,7 +395,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
@@ -428,7 +428,7 @@ msgstr "Ophalen bron %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Ophalen van sommige archieven is mislukt."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
 
@@ -437,49 +437,49 @@ msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Bouwopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Dochterproces is mislukt"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -488,7 +488,7 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -497,14 +497,14 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -513,7 +513,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:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -522,30 +522,30 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bouwvereisten voor %s konden niet voldaan worden."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Er wordt verbinding gemaakt met %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -634,18 +634,22 @@ msgstr ""
 "voor meer informatie en opties.\n"
 "                       Deze APT heeft Super Koe kracht.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -654,6 +658,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -683,8 +688,9 @@ msgstr "%s is reeds de nieuwste versie.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s is reeds de nieuwste versie.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Er is gewacht op %s, maar die kwam niet"
@@ -879,7 +885,7 @@ msgstr "Kon geen socket aanmaken"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kon de datasocket niet verbinden, de verbinding verliep"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislukt"
 
@@ -925,7 +931,7 @@ msgstr "Datasocket verbinding is verlopen"
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Probleem bij het hashen van het bestand"
 
@@ -1059,94 +1065,185 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Selectie is mislukt"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Verbinding verliep"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar het uitvoerbestand"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Wachtend op de kopteksten"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Foute koptekstregel"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Onbekend datumformaat"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Geraakt "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Ophalen:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Genegeerd "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Fout "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Bezig]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Medium wisselen: Gelieve de schijf met label\n"
+" '%s'\n"
+"in het station '%s' te plaatsen en op 'enter' te drukken\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+"WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Authentificatiewaarschuwing is genegeerd.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Sommige pakketten konden niet geauthentificeerd worden"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Wilt u deze pakketten installeren zonder verificatie?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interne fout, rangschikken is niet voltooid"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian."
@@ -1154,52 +1251,48 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Ja, doe wat ik zeg!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1210,19 +1303,19 @@ msgstr ""
 "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Afbreken."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Wilt u doorgaan?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Ophalen van sommige bestanden is mislukt"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1230,19 +1323,19 @@ msgstr ""
 "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
 "fix-missing proberen?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Geen oplossing voor de missende pakketten gevonden."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Installatie wordt afgebroken."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1256,15 +1349,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1282,15 +1375,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "De volgende informatie helpt u mogelijk verder:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1302,7 +1395,7 @@ msgstr[1] ""
 "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
 "nodig:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1311,7 +1404,7 @@ 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:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1332,7 +1425,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:628
+#: apt-private/private-install.cc:638
 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,73 +1436,73 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Niet-werkende pakketten:"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Voorgestelde pakketten:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Aanbevolen pakketten:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
 "gevraagd.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s wordt overgeslagen, het is niet geïnstalleerd en alleen opwaardering is "
 "gevraagd.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s is reeds de nieuwste versie.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1417,136 +1510,120 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Geïnstalleerd]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Geïnstalleerd]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Geïnstalleerd]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Geïnstalleerd]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "maar %s is geïnstalleerd"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "maar %s zal geïnstalleerd worden"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "maar het is niet installeerbaar"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "maar het is een virtueel pakket"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "maar het is niet geïnstalleerd"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "maar het zal niet geïnstalleerd worden"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " of"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "De volgende pakketten hebben niet-voldane vereisten:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "De volgende pakketten zullen VERWIJDERD worden:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "De volgende pakketten zijn achtergehouden:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "De volgende pakketten zullen opgewaardeerd worden:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (vanwege %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1554,27 +1631,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu opnieuw geïnstalleerd, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu gedegradeerd, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
@@ -1583,7 +1660,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[J/n]"
 
@@ -1591,36 +1668,28 @@ msgstr "[J/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1634,40 +1703,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-"WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Authentificatiewaarschuwing is genegeerd.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Sommige pakketten konden niet geauthentificeerd worden"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Wilt u deze pakketten installeren zonder verificatie?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1678,74 +1713,44 @@ msgstr "Hernoemen van %s naar %s is mislukt"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "De opdracht 'update' aanvaard geen argumenten"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Klaar"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Geraakt "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Ophalen:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Genegeerd "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Fout "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Bezig]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Medium wisselen: Gelieve de schijf met label\n"
-" '%s'\n"
-"in het station '%s' te plaatsen en op 'enter' te drukken\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kan %s niet lezen"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1824,36 +1829,433 @@ msgstr ""
 msgid "Merging available information"
 msgstr "De beschikbare informatie wordt samengevoegd"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode werd aangeroepen op een nog gelinkte knoop"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Lokaliseren van het hash-element is mislukt!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Kan de status van %s niet opvragen"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Toewijzen van de omleiding is mislukt"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kan niet naar %s schrijven"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Interne fout in AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Pakket-extensielijst is te lang"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Fout bij het verwerken van map %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Bron-extensielijst is te lang"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dubbele toevoeging van de omleiding %s->%s"
+msgid "Error processing contents %s"
+msgstr "Fout bij het verwerken van de inhoud van %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Geen van de selecties kwam overeen"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Dubbel configuratiebestand %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB is beschadigd, bestand hernoemd naar %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Kan het DB-bestand %s niet openen: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "stat op %s is mislukt"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "readlink op %s is mislukt"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Archief heeft geen 'control'-record"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Archief heeft geen 'package'-veld"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr " %s heeft geen voorrangsingang\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s beheerder is %s, niet %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Hernoemen van %s naar %s is mislukt"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1879,17 +2281,6 @@ msgstr "Het pakket probeert om het omleidingsdoel %s/%s weg te schrijven"
 msgid "The diversion path is too long"
 msgstr "Het omleidingspad is te lang"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1918,30 +2309,36 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
 msgid "Unable to stat %s"
 msgstr "Kan de status van %s niet opvragen"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode werd aangeroepen op een nog gelinkte knoop"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Sluiten van bestand %s is mislukt"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Lokaliseren van het hash-element is mislukt!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Toewijzen van de omleiding is mislukt"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Interne fout in AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Interne fout, kon onderdeel %s niet vinden"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dubbele toevoeging van de omleiding %s->%s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Niet-ontleedbaar 'control'-bestand"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Dubbel configuratiebestand %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1989,205 +2386,52 @@ msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "dpkg wordt uitgevoerd"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Kan geen geschikt pakketsysteemtype bepalen"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i records weggeschreven.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i records weggeschreven met %i missende bestanden.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Interne fout, kon onderdeel %s niet vinden"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Kan geen authenticatierecord vinden voor: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Niet-ontleedbaar 'control'-bestand"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash-som komt niet overeen voor: %s"
-
-#: 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/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/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:155
-msgid "Empty package cache"
-msgstr "Lege pakketcache"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Het pakketcachebestand is beschadigd"
-
-#: 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:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Het pakketcachebestand is beschadigd"
+msgid "List directory %spartial is missing."
+msgstr "Lijstmap %spartial is afwezig."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet"
-
-#: 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:321
-msgid "Depends"
-msgstr "Vereisten"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Voor-Vereisten"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Suggesties"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Aanbevelingen"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Conflicteert met"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Vervangt"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Verouderd"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Breekt"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Vult aan"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "belangrijk"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "noodzakelijk"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standaard"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "optioneel"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Archives directory %spartial is missing."
+msgstr "Archiefmap %spartial is afwezig."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
+msgid "Unable to lock directory %s"
+msgstr "Kan de map %s niet vergrendelen"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, 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:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s startte niet op de juiste manier"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Indexbestand van type '%s' wordt niet ondersteund"
 
-#: 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/depcache.cc:250
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Openen van StateFile %s is mislukt"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
+msgid "Retrieving file %li of %li"
+msgstr "Bestand %li van %li wordt opgehaald"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2207,36 +2451,36 @@ msgstr "Grootte komt niet overeen"
 msgid "Invalid file format"
 msgstr "Ongeldige operatie %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2247,12 +2491,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fout: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2261,12 +2505,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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2274,172 +2518,123 @@ msgstr ""
 "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
 "pakket %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fout tijdens verwerken van %s (FindPkg)"
-
-#: 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: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: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."
+msgid "Is the package %s installed?"
+msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Methode %s startte niet op de juiste manier"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Pakket %s %s werd niet gevonden bij het verwerken van de "
-"bestandsafhankelijkheden"
+"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
+"'enter' te drukken."
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
-
-#: 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"
+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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Voorziene bestanden worden verzameld"
+#: 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kan niet naar %s schrijven"
+#: 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/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
+#: 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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Verkopersblok %s bevat geen vingerafdruk"
+#: 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/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Lijstmap %spartial is afwezig."
+#: 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/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Archiefmap %spartial is afwezig."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release '%s' voor '%s' is niet gevonden"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Kan de map %s niet vergrendelen"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versie '%s' voor '%s' is niet gevonden"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
+msgid "Couldn't find task '%s'"
+msgstr "Kon taak '%s' niet vinden"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Bestand %li van %li wordt opgehaald"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Kon geen enkel pakket vinden bij regex '%s'"
 
-#: 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/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/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/cacheset.cc:626
+#, fuzzy, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te "
-"bevatten"
-
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kan de status van %s niet opvragen."
+"Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
+"Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' "
+"selecteren omdat deze geen van beide heeft"
 
-#: apt-pkg/policy.cc:422
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 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/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
+"Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver "
+"virtueel is"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
-"Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie "
-"'man 5 apt.conf', onder APT::Immediate-Configure. (%d)"
-
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Kon het bestand '%s' niet openen"
+"Kan de kandidaat-versie van het pakket %s niet selecteren omdat deze geen "
+"kandidaat heeft"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat deze "
+"niet geïnstalleerd is"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2523,55 +2718,88 @@ msgstr "Nieuwe bronlijst wordt weggeschreven\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Kan de status van %s niet opvragen."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Boom van vereisten wordt opgebouwd"
 
-#: 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: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/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Openen van StateFile %s is mislukt"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Kon pakketbestand %s niet ontleden (1)"
+msgid "Wrote %i records.\n"
+msgstr "%i records weggeschreven.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Kon pakketbestand %s niet ontleden (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i records weggeschreven met %i missende bestanden.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Kan geen authenticatierecord vinden voor: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash-som komt niet overeen voor: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2598,6 +2826,221 @@ msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Geen 'Date'-vermelding in Release-bestand %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Kan geen geschikt pakketsysteemtype bepalen"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "dpkg wordt uitgevoerd"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Kon het bestand '%s' niet openen"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Lege pakketcache"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Het pakketcachebestand is beschadigd"
+
+#: 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:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Het pakketcachebestand is beschadigd"
+
+#: 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:179
+msgid "The package cache was built for a different architecture"
+msgstr "De pakketcache was aangemaakt voor een andere architectuur"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Vereisten"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Voor-Vereisten"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Suggesties"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Aanbevelingen"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Conflicteert met"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Vervangt"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Verouderd"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Breekt"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Vult aan"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "belangrijk"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "noodzakelijk"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standaard"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "optioneel"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Voorziene bestanden worden verzameld"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Indexbestand van type '%s' wordt niet ondersteund"
+
+#: 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/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
+
 #: apt-pkg/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2674,246 +3117,150 @@ msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
 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/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:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versie '%s' voor '%s' is niet gevonden"
+#: 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/cacheset.cc:603
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Kon taak '%s' niet vinden"
+msgid "Unable to parse package file %s (1)"
+msgstr "Kon pakketbestand %s niet ontleden (1)"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Kon geen enkel pakket vinden bij regex '%s'"
-
-#: 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: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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Kon pakketbestand %s niet ontleden (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-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:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver "
-"virtueel is"
+"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
+"zijn oudere versies van gebruikt."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Verkopersblok %s bevat geen vingerafdruk"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Kan de status van het aanhechtpunt %s niet opvragen"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "%s wordt geïnstalleerd"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "stat op de CD-ROM is mislukt"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "%s wordt geconfigureerd"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Commandoregel-optie '%c' [van %s] is onbekend."
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "%s wordt verwijderd"
+msgid "Command line option %s is not understood"
+msgstr "Commandoregel-optie %s wordt niet begrepen"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "%s wordt volledig verwijderd"
+msgid "Command line option %s is not boolean"
+msgstr "Commandoregel-optie %s is niet booleaans"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "De verdwijning van %s wordt opgemerkt"
+msgid "Option %s requires an argument."
+msgstr "Optie %s vereist een argument."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Post-installatie-trigger %s wordt uitgevoerd"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Optie %s: De specificatie van het configuratie-item dient een =<waarde> te "
+"bevatten."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Map '%s' ontbreekt"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Optie %s vereist een integer getal als argument, niet '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Kon het bestand '%s' niet openen"
+msgid "Option '%s' is too long"
+msgstr "Optie '%s' is te lang"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "%s wordt voorbereid"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Waarde %s wordt niet begrepen, probeer 'true' of 'false'."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "%s wordt uitgepakt"
+msgid "Invalid operation %s"
+msgstr "Ongeldige operatie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Configuratie van %s wordt voorbereid"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Onbekende type-afkorting '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "%s is geïnstalleerd"
+msgid "Opening configuration file %s"
+msgstr "Configuratiebestand %s wordt geopend"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Verwijdering van %s wordt voorbereid"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaxfout %s:%u: Blok start zonder naam."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "%s is verwijderd"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Volledige verwijdering van %s wordt voorbereid"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaxfout %s:%u: Extra rommel na waarde"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s is volledig verwijderd"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemen met vereisten - wordt niet geconfigureerd"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
-"eerdere mislukking."
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
-"over een volle schijf."
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
-"over onvoldoende-geheugen."
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
-"over een volle schijf."
+"Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven "
+"worden"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander "
-"proces?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"dpkg werd onderbroken; voer handmatig '%s' uit om het probleem te verhelpen. "
+"Syntaxfout %s:%u: De richtlijn 'clear' vereist een optieboom als argument"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Niet vergrendeld"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3031,54 +3378,11 @@ msgstr "Probleem bij het ontlinken van het bestand %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Selectie %s niet gevonden"
+msgid "No keyring installed in %s."
+msgstr "Geen sleutelring geïnstalleerd in %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3136,528 +3440,235 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd"
+msgid "%c%s... Error!"
+msgstr "%c%s... Fout!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'"
+msgid "%c%s... Done"
+msgstr "%c%s... Klaar"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Klaar"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Optie %s vereist een argument."
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %liu %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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."
+msgid "%lih %limin %lis"
+msgstr "%liu %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Optie %s vereist een integer getal als argument, niet '%s'"
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Optie '%s' is te lang"
+msgid "%lis"
+msgstr "%lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Waarde %s wordt niet begrepen, probeer 'true' of 'false'."
+msgid "Selection %s not found"
+msgstr "Selectie %s niet gevonden"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Pakket-extensielijst is te lang"
+"Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander "
+"proces?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Fout bij het verwerken van map %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Bron-extensielijst is te lang"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Fout bij het verwerken van de inhoud van %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Geen van de selecties kwam overeen"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB is beschadigd, bestand hernoemd naar %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd"
+"dpkg werd onderbroken; voer handmatig '%s' uit om het probleem te verhelpen. "
 
-#: ftparchive/cachedb.cc:94
-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."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Niet vergrendeld"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Kan het DB-bestand %s niet openen: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink op %s is mislukt"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Archief heeft geen 'control'-record"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Kan geen cursor verkrijgen"
+msgid "Installing %s"
+msgstr "%s wordt geïnstalleerd"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Kon map %s niet lezen\n"
+msgid "Configuring %s"
+msgstr "%s wordt geconfigureerd"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, 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 "
+msgid "Removing %s"
+msgstr "%s wordt verwijderd"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:98
 #, 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"
+msgid "Completely removing %s"
+msgstr "%s wordt volledig verwijderd"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "Openen van %s is mislukt"
+msgid "Noting disappearance of %s"
+msgstr "De verdwijning van %s wordt opgemerkt"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " OntlLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "Post-installatie-trigger %s wordt uitgevoerd"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink op %s is mislukt"
+msgid "Directory '%s' missing"
+msgstr "Map '%s' ontbreekt"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Ontlinken van %s is mislukt"
+msgid "Could not open file '%s'"
+msgstr "Kon het bestand '%s' niet openen"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Linken van %s aan %s is mislukt"
+msgid "Preparing %s"
+msgstr "%s wordt voorbereid"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Ontlinklimiet van %sB bereikt.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archief heeft geen 'package'-veld"
+msgid "Unpacking %s"
+msgstr "%s wordt uitgepakt"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s heeft geen voorrangsingang\n"
+msgid "Preparing to configure %s"
+msgstr "Configuratie van %s wordt voorbereid"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s beheerder is %s, niet %s\n"
+msgid "Installed %s"
+msgstr "%s is geïnstalleerd"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
+msgid "Preparing for removal of %s"
+msgstr "Verwijdering van %s wordt voorbereid"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Geheugentoewijzing is mislukt"
+msgid "Removed %s"
+msgstr "%s is verwijderd"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "Volledige verwijdering van %s wordt voorbereid"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "%s is volledig verwijderd"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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'"
+msgid "Can not write log (%s)"
+msgstr "Kan niet naar %s schrijven"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Gecomprimeerde uitvoer %s vereist een compressieset"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Aanmaken van FILE* is mislukt"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Vorken van proces is mislukt"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Comprimeer kind"
+#: apt-pkg/deb/dpkgpm.cc:1687
+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"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Interne fout, aanmaken van %s is mislukt"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemen met vereisten - wordt niet geconfigureerd"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO naar subproces/bestand is mislukt"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
+"eerdere mislukking."
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
+"over een volle schijf."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Probleem bij het ontlinken van %s"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
+"over onvoldoende-geheugen."
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 #, 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 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!"
+"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
+"over een volle schijf."
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout over "
+"dpkg-I/O is."
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
 
 #~ 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 f39b5d47b..7c5f77759 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
-"Language: \n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.9.1\n"
 
 #: cmdline/apt-cache.cc:149
@@ -101,75 +102,75 @@ msgstr "Brukt plass i alt: "
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ute av takt."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Du må oppgi nøyaktig eitt mnster"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Finn ikkje pakken %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(ikkje funne)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Pakke spikra til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -334,7 +335,7 @@ msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "men %s skal installerast"
@@ -363,7 +364,7 @@ msgstr "Klarte ikkje låsa nedlastingskatalogen"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
@@ -389,7 +390,7 @@ 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:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
@@ -422,7 +423,7 @@ msgstr "Hent kjeldekode %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 
@@ -431,67 +432,67 @@ msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen «%s» mislukkast.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, 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:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -500,37 +501,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:1357
+#: cmdline/apt-get.cc:1358
 #, 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:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Koplar til %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Støtta modular:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -616,16 +617,20 @@ msgstr ""
 "til apt-get(8), sources.list(5) og apt.conf(5).\n"
 "                       APT har superku-krefter.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -634,6 +639,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -663,8 +669,9 @@ msgstr "Den nyaste versjonen av %s er installert frå før.\n"
 msgid "%s was already not hold.\n"
 msgstr "Den nyaste versjonen av %s er installert frå før.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta på %s, men den fanst ikkje"
@@ -860,7 +867,7 @@ msgstr "Klarte ikkje oppretta sokkel"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot på sambandet"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislukkast"
 
@@ -906,7 +913,7 @@ msgstr "Tidsavbrot på tilkopling til datasokkel"
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
@@ -1035,144 +1042,231 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Feil ved lesing frå tenaren"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Tidsavbrot på sambandet"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Ventar på hovud"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Øydelagd hovudlinje"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Øydelagde hovuddata"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Treff "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Hent:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Feil "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Arbeider]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Skifte av medum: Set inn plata merkt\n"
+" «%s»\n"
+"i stasjonen «%s» og trykk Enter.\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane."
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Nokre pakkar kunne ikkje bli autentisert"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Installer desse pakkane utan verifikasjon?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Klarte ikkje henta %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Ja, gjer som eg seier!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1183,19 +1277,19 @@ msgstr ""
 "For å halda fram, må du skriva nøyaktig «%s».\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Avbryt."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Vil du halda fram?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1203,19 +1297,19 @@ msgstr ""
 "Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller "
 "«--fix-missing»."
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Klarte ikkje retta opp manglande pakkar."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Avbryt installasjon."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1225,15 +1319,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1249,16 +1343,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1268,7 +1362,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:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1276,7 +1370,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:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
@@ -1295,7 +1389,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:628
+#: apt-private/private-install.cc:638
 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"
@@ -1307,72 +1401,72 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Øydelagde pakkar"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Føreslåtte pakkar:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Tilrådde pakkar"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Hoppar over %s, for den er installert frå før og ikkje sett til "
 "oppgradering.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Hoppar over %s, for den er installert frå før og ikkje sett til "
 "oppgradering.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Den nyaste versjonen av %s er installert frå før.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Vald versjon %s (%s) for %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Vald versjon %s (%s) for %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1380,137 +1474,116 @@ msgid_plural ""
 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."
+#: 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 ""
-"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:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Installert]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Installert]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Installert]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Installert]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installerast"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "men lèt seg ikkje installera"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "men er ein virtuell pakke"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "men er ikkje installert"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "men skal ikkje installerast"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " eller"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Dei følgjande NYE pakkane vil verta installerte:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Dei følgjande pakkane vil verta FJERNA:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Dei følgjande pakkane er haldne tilbake:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Dei følgjande pakkane vil verta oppgraderte:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 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:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (fordi %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -1519,27 +1592,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nyleg installerte, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installerte på nytt, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
@@ -1548,7 +1621,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[J/n]"
 
@@ -1556,36 +1629,28 @@ msgstr "[J/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1599,35 +1664,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane."
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Nokre pakkar kunne ikkje bli autentisert"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Installer desse pakkane utan verifikasjon?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Klarte ikkje henta %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1638,74 +1674,44 @@ msgstr "Klarte ikkje endra namnet på %s til %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdateringskommandoen tek ingen argument"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Ferdig"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Treff "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Hent:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Feil "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Arbeider]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Skifte av medum: Set inn plata merkt\n"
-" «%s»\n"
-"i stasjonen «%s» og trykk Enter.\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarte ikkje lesa %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1779,36 +1785,425 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller på nytt."
 msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode vart kalla på ein node som framleis er lenkja"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Fann ikkje nøkkelelementet."
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Klarte ikkje få status til %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Klarte ikkje tildela avleiing"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Klarte ikkje skriva til %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Intern feil i AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Lista over pakkeutvidingar er for lang"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Feil ved lesing av katalogen %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Lista over kjeldeutvidingar er for lang"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Feil ved skriving av topptekst til innhaldsfila"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dobbel tilleggjing av avleiing %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Feil ved lesing av %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+#, 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:822
+msgid "No selections matched"
+msgstr "Ingen utval passa"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Dobbel oppsettsfil %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Enkelte filer manglar i pakkefilgruppa %s"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Databasen er øydelagd. Filnamnet er endra til %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB er for gammal, forsøkjer å oppgradere %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Klarte ikkje opna DB-fila %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Klarte ikkje få status til %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Klarte ikkje lesa lenkja %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen kontrollpost"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Arkivet har ikkje noko pakkefelt"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s har inga overstyringsoppføring\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
+
+#: ftparchive/writer.cc:706
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s har inga overstyringsoppføring\n"
+
+#: ftparchive/writer.cc:710
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s har inga overstyringsoppføring\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Klarte ikkje endra namnet på %s til %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1834,17 +2229,6 @@ msgstr "Pakken prøver å skriva til avleiingsmålet %s/%s"
 msgid "The diversion path is too long"
 msgstr "Avleiingsstigen er for lang"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1873,30 +2257,36 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
 msgid "Unable to stat %s"
 msgstr "Klarte ikkje få status til %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode vart kalla på ein node som framleis er lenkja"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Klarte ikkje lukka fila %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Fann ikkje nøkkelelementet."
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Klarte ikkje tildela avleiing"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Intern feil i AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar «%s»-medlemmen"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Intern feil, fann ikkje medlemmen %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dobbel tilleggjing av avleiing %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Kontrollfila kan ikkje tolkast"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Dobbel oppsettsfil %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1944,203 +2334,52 @@ msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjend TAR-hovud type %u, medlem %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Pakkesystemet «%s» er ikkje støtta"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Skreiv %i postar.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Skreiv %i postar med %i manglande filer.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar «%s»-medlemmen"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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"
+msgid "Internal error, could not locate member %s"
+msgstr "Intern feil, fann ikkje medlemmen %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Kontrollfila kan ikkje tolkast"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Feil MD5-sum"
-
-#: 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/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/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Kjeldelista kan ikkje lesast."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Tomt pakkelager"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Pakkelagerfila er øydelagd"
-
-#: 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:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Pakkelagerfila er øydelagd"
-
-#: 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:179
-msgid "The package cache was built for a different architecture"
-msgstr "Pakkelageret er bygd for ein annan arkitektur"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Krav"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Forkrav"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Forslag"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Tilrådingar"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Konflikt"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Byter ut"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Foreldar"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "viktig"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "påkravd"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "vanleg"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "valfri"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "tillegg"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finn ikkje metodedrivaren %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
+msgid "List directory %spartial is missing."
+msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s starta ikkje rett"
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Arkivkatalogen %spartial manglar."
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire.cc:99
 #, 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"
+msgid "Unable to lock directory %s"
+msgstr "Klarte ikkje låsa listekatalogen"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "Indeksfiltypen «%s» er ikkje støtta"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Byggjer kravtre"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidatversjonar"
-
-#: 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 "Failed to open StateFile %s"
-msgstr "Klarte ikkje opna %s"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikkje skriva fila %s"
+msgid "Retrieving file %li of %li"
+msgstr "Les filliste"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2161,35 +2400,35 @@ msgstr "Feil storleik"
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2197,12 +2436,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2211,176 +2450,124 @@ 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, 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/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Finn ikkje metodedrivaren %s."
 
-#. 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 "Feil ved behandling av %s (FindPkg)"
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s starta ikkje rett"
 
-#: 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/acquire-worker.cc:455
+#, 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/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/algorithms.cc:265
+#, 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/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/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/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/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/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikkje få status på kjeldepakkelista %s"
+#: 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/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/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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar inn filtilbod"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Kjeldelista kan ikkje lesast."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Fann ikkje utgåva «%s» av «%s»"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Fann ikkje versjonen «%s» av «%s»"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listekatalogen %spartial manglar."
+msgid "Couldn't find task '%s'"
+msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkivkatalogen %spartial manglar."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Klarte ikkje låsa listekatalogen"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Fann ikkje pakken %s"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
-
-#: apt-pkg/acquire.cc:901
-#, fuzzy, c-format
-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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 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/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarte ikkje få status på %s."
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, 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:444
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Did not understand pin type %s"
-msgstr "Skjønar ikkje spikringstypen %s"
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr "Ingen prioritet (eller null) oppgitt for spiker"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Klarte ikkje opna fila %s"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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
@@ -2460,54 +2647,87 @@ msgstr "Skriv ny kjeldeliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppføringar for denne disken er:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Klarte ikkje få status på %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Byggjer kravtre"
 
-#: 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversjonar"
+
+#: 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 "Failed to open StateFile %s"
+msgstr "Klarte ikkje opna %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikkje skriva fila %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Skreiv %i postar.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Klarte ikkje tolka pakkefila %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Skreiv %i postar med %i manglande filer.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Feil MD5-sum"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2534,6 +2754,215 @@ msgstr "Ugyldig linje i avleiingsfila: %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Pakkesystemet «%s» er ikkje støtta"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Klarte ikkje opna fila %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Tomt pakkelager"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Pakkelagerfila er øydelagd"
+
+#: 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:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Pakkelagerfila er øydelagd"
+
+#: 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:179
+msgid "The package cache was built for a different architecture"
+msgstr "Pakkelageret er bygd for ein annan arkitektur"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Krav"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Forkrav"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Forslag"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Tilrådingar"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Konflikt"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Byter ut"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Foreldar"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "viktig"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "påkravd"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "vanleg"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "valfri"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "tillegg"
+
+#: 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: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: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: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: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: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: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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Klarte ikkje få status på kjeldepakkelista %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 "Les pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samlar inn filtilbod"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Indeksfiltypen «%s» er ikkje støtta"
+
+#: 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 record in the preferences file %s, no Package header"
+msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Skjønar ikkje spikringstypen %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Ingen prioritet (eller null) oppgitt for spiker"
+
 #: apt-pkg/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2609,221 +3038,143 @@ msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
 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/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Fann ikkje utgåva «%s» av «%s»"
+#: 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/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Fann ikkje versjonen «%s» av «%s»"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Fann ikkje pakken %s"
-
-#: 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:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Fann ikkje pakken %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "Klarte ikkje tolka pakkefila %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 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"
+"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/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "  Installert: "
-
-#: 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:97 apt-pkg/deb/dpkgpm.cc:1003
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Opnar %s"
+msgid "Unable to stat the mount point %s"
+msgstr "Klarte ikkje få status til monteringspunktet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Klarte ikkje fjerna %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Klarte ikkje få status til CD-ROM"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Kjenner ikkje kommandolinjevalet «%c» (frå %s)."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
+msgid "Command line option %s is not understood"
+msgstr "Skjønar ikkje kommandolinjevalet %s"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "Listekatalogen %spartial manglar."
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Kommandolinjevalet %s er ikkje boolsk"
 
-#: 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/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/deb/dpkgpm.cc:989
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Opnar %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 "Val %s: Spesifikasjonen av oppsettselementet må ha ein =<verdi>."
 
-#: apt-pkg/deb/dpkgpm.cc:990
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Opnar %s"
+#: 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/deb/dpkgpm.cc:995
-#, fuzzy, c-format
-msgid "Preparing to configure %s"
-msgstr "Opnar oppsettsfila %s"
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Valet «%s» er for langt"
 
-#: apt-pkg/deb/dpkgpm.cc:997
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr "  Installert: "
+#: 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/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
+msgid "Invalid operation %s"
+msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Tilrådingar"
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Ukjend typeforkorting: «%c»"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
-#, fuzzy, c-format
-msgid "Preparing to completely remove %s"
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Klarte ikkje fjerna %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaksfeil %s:%u: Misforma tagg"
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikkje støtta"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Klarte ikkje låsa listekatalogen"
+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"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2938,54 +3289,11 @@ msgstr "Problem ved oppheving av lenkje til fila"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s ... Ferdig"
-
-#. 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"
+msgid "No keyring installed in %s."
+msgstr "Avbryt installasjon."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3040,515 +3348,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaksfeil %s:%u: Inkludert herifrå"
+msgid "%c%s... Error!"
+msgstr "%c%s ... Feil"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, 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"
+msgid "%c%s... Done"
+msgstr "%c%s ... Ferdig"
 
-#: 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"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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"
+msgid "%c%s... %u%%"
+msgstr "%c%s ... Ferdig"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Valet %s krev eit argument."
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Val %s: Spesifikasjonen av oppsettselementet må ha ein =<verdi>."
+msgid "%lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Valet %s må ha eit heiltalsargument, ikkje «%s»"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Valet «%s» er for langt"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Skjønar ikkje %s. Prøv «true» eller «false»."
+msgid "Selection %s not found"
+msgstr "Fann ikkje utvalet %s"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Lista over pakkeutvidingar er for lang"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Feil ved lesing av katalogen %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista over kjeldeutvidingar er for lang"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Feil ved skriving av topptekst til innhaldsfila"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Klarte ikkje låsa listekatalogen"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Feil ved lesing av %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-#, 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Ingen utval passa"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Enkelte filer manglar i pakkefilgruppa %s"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Databasen er øydelagd. Filnamnet er endra til %s.old"
 
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB er for gammal, forsøkjer å oppgradere %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Klarte ikkje opna DB-fila %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Klarte ikkje lesa lenkja %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen kontrollpost"
-
-#: ftparchive/cachedb.cc:594
-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"
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Installert: "
 
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Klarte ikkje lesa lenkja %s"
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Koplar til %s"
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Klarte ikkje oppheva lenkja %s"
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Opnar %s"
 
-#: ftparchive/writer.cc:298
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Klarte ikkje lenkja %s til %s"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Klarte ikkje fjerna %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-grensa på %sB er nådd.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arkivet har ikkje noko pakkefelt"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har inga overstyringsoppføring\n"
+msgid "Running post-installation trigger %s"
+msgstr ""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Listekatalogen %spartial manglar."
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har inga overstyringsoppføring\n"
+msgid "Could not open file '%s'"
+msgstr "Klarte ikkje opna fila %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:992
 #, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har inga overstyringsoppføring\n"
+msgid "Preparing %s"
+msgstr "Opnar %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Klarte ikkje tildela minne"
+#: apt-pkg/deb/dpkgpm.cc:993
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Opnar %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "Klarte ikkje opna %s"
+#: apt-pkg/deb/dpkgpm.cc:998
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Opnar oppsettsfila %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Misforma overstyring %s linje %lu #1"
+msgid "Installed %s"
+msgstr "  Installert: "
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Klarte ikkje lesa overstyringsfila %s"
+msgid "Preparing for removal of %s"
+msgstr ""
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Misforma overstyring %s linje %lu #1"
+msgid "Removed %s"
+msgstr "Tilrådingar"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Misforma overstyring %s linje %lu #2"
+msgid "Preparing to completely remove %s"
+msgstr "Opnar oppsettsfila %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "Klarte ikkje fjerna %s"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimert utdata %s treng eit komprimeringssett"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Klarte ikkje skriva til %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Klarte ikkje oppretta FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Klarte ikkje gafla"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimer barn"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Intern feil, klarte ikkje oppretta %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Klarte ikkje kommunisera med underprosess/fil"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Klarte ikkje lesa under utrekning av MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem ved oppheving av lenkje til %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Intern feil. AllUpgrade øydelagde noko"
 
 #~ 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 844d9b1e0..95785904a 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -102,76 +102,76 @@ msgstr "Całkowity rozmiar: "
 msgid "Package file %s is out of sync."
 msgstr "Plik pakietu %s jest przestarzały."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Należy podać przynajmniej jeden wzorzec"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 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:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Plików pakietów:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Przypięte pakiety:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(nie znaleziono)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Zainstalowana: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  KandydujÄ…ca: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(brak)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Sposób przypięcia: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Tabela wersji:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -333,7 +333,7 @@ msgid "Couldn't find package %s"
 msgstr "Nie udało się odnaleźć pakietu %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
@@ -365,7 +365,7 @@ msgstr ""
 "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
 "źródła"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
@@ -398,7 +398,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pomijanie już pobranego pliku \"%s\"\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
@@ -431,7 +431,7 @@ msgstr "Pobieranie źródeł %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Nie udało się pobrać niektórych archiwów."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Ukończono pobieranie w trybie samego pobierania"
 
@@ -440,32 +440,32 @@ msgstr "Ukończono pobieranie w trybie samego pobierania"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Polecenie budowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Proces potomny zawiódł"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -474,17 +474,17 @@ msgstr ""
 "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt."
 "conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nie ma zależności dla budowania.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -493,7 +493,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:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -502,14 +502,14 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
 "pakietu %s"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -518,7 +518,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -527,30 +527,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Nie udało się przetworzyć zależności dla budowania"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Dziennik zmian %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Obsługiwane moduły:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -638,18 +638,22 @@ msgstr ""
 "apt-get(8), sources.list(5) i apt.conf(5).\n"
 "                         Ten APT ma moce Super Krowy.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -658,6 +662,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -687,8 +692,9 @@ msgstr "%s został już zatrzymany.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s został już odznaczony jako zatrzymany.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Oczekiwano na proces %s, ale nie było go"
@@ -908,7 +914,7 @@ msgstr "Nie udało się utworzyć gniazda"
 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Nie udało się"
 
@@ -954,7 +960,7 @@ msgstr "Przekroczony czas połączenia gniazda danych"
 msgid "Unable to accept connection"
 msgstr "Nie udało się przyjąć połączenia"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Nie udało się obliczyć skrótu pliku"
 
@@ -1087,91 +1093,184 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Puste pliki nie mogą być prawidłowymi archiwami"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "BÅ‚Ä…d przy pisaniu do pliku"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "BÅ‚Ä…d czytania z serwera"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "BÅ‚Ä…d przy pisaniu do pliku"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Operacja select nie powiodła się"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Przekroczenie czasu połączenia"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Błąd przy pisaniu do pliku wyjściowego"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Oczekiwanie na nagłówki"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Nieprawidłowa linia nagłówka"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Nieznany format daty"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Błędne dane nagłówka"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Połączenie nie powiodło się"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+# Ujednolicono z aptitude
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Stary "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Pobieranie:"
+
+# Wyrównane do Hit i Err.
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign.  "
+
+# Wyrównane do Hit i Ign.
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "BÅ‚Ä…d  "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Pracuje]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Zmiana nośnika: Proszę włożyć dysk oznaczony\n"
+" \"%s\"\n"
+"do napędu \"%s\" i nacisnąć enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Zainstalować te pakiety bez weryfikacji?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 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:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Błąd wewnętrzny, sortowanie niezakończone"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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 "
@@ -1179,53 +1278,49 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Tak, jestem pewien!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1236,19 +1331,19 @@ msgstr ""
 "Aby kontynuować proszę napisać zdanie \"%s\"\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Przerwane."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Kontynuować?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Nie udało się pobrać niektórych plików"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1256,19 +1351,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:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Nie udało się poprawić brakujących pakietów."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Przerywanie instalacji"
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1285,15 +1380,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:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Uwaga: dpkg wykonał to automatycznie i celowo."
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1311,15 +1406,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Błąd wewnętrzny spowodowany przez AutoRemover"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1335,7 +1430,7 @@ msgstr[2] ""
 "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
 "wymagane:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1350,7 +1445,7 @@ msgstr[2] ""
 "%lu pakietów zostało zainstalowanych automatycznie i nie są już więcej "
 "wymagane.\n"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 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\"."
@@ -1370,7 +1465,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:628
+#: apt-private/private-install.cc:638
 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"
@@ -1382,73 +1477,73 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Pakiety sÄ… uszkodzone"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Sugerowane pakiety:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Polecane pakiety:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Pomijanie %s, nie jest zainstalowane, a wybrano wyłącznie aktualizacje.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s jest już w najnowszej wersji.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Wybrano wersjÄ™ \"%s\" (%s) pakietu \"%s\"\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Wybrano wersjÄ™ \"%s\" (%s) pakietu \"%s\", z powodu \"%s\"\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty. Czy chodziło o "
 "\"%s\"?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakiet \"%s\" nie jest zainstalowany, więc nie zostanie usunięty\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1457,136 +1552,120 @@ 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Zainstalowany]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Zainstalowany]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Zainstalowany]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Zainstalowany]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Następujące pakiety mają niespełnione zależności:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "ale %s jest zainstalowany"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale %s ma zostać zainstalowany"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ale nie da się go zainstalować"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "ale jest pakietem wirtualnym"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "ale nie jest zainstalowany"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "ale nie zostanie zainstalowany"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " lub"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Następujące pakiety mają niespełnione zależności:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Następujące pakiety zostaną USUNIĘTE:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Następujące pakiety zostały zatrzymane:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Następujące pakiety zostaną zaktualizowane:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (z powodu %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1594,27 +1673,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ponownie instalowanych, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu cofniętych wersji, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
@@ -1623,7 +1702,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[T/n]"
 
@@ -1631,37 +1710,28 @@ msgstr "[T/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "T"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1676,39 +1746,6 @@ msgstr[2] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Zainstalować te pakiety bez weryfikacji?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1719,77 +1756,45 @@ msgstr "Nie udało się zmienić nazwy %s na %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Polecenie update nie wymaga żadnych argumentów"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Gotowe"
 
-# Ujednolicono z aptitude
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Stary "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Pobieranie:"
-
-# Wyrównane do Hit i Err.
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign.  "
-
-# Wyrównane do Hit i Ign.
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "BÅ‚Ä…d  "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Pracuje]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Zmiana nośnika: Proszę włożyć dysk oznaczony\n"
-" \"%s\"\n"
-"do napędu \"%s\" i nacisnąć enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nie można czytać %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1866,36 +1871,430 @@ msgstr ""
 msgid "Merging available information"
 msgstr "�ączenie informacji o dostępnych pakietach"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode wywołane na wciąż podłączonym węźle"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Nie udało się odnaleźć elementu tablicy haszującej!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nie można wykonać operacji stat na %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Nie udało się utworzyć ominięcia"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nie udało się pisać do %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Błąd wewnętrzny w AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Lista rozszerzeń pakietów jest zbyt długa"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Próba nadpisania ominięcia, %s -> %s i %s/%s"
+msgid "Error processing directory %s"
+msgstr "BÅ‚Ä…d przetwarzania katalogu %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Lista rozszerzeń źródeł jest zbyt długa"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Podwójne dodanie ominięcia %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Błąd podczas przetwarzania zawartości %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Nie dopasowano żadnej nazwy"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Zduplikowany plik konfiguracyjny %s/%s"
+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:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Baza jest przestarzała, próbuję zaktualizować %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nie udało się otworzyć pliku bazy %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Nie udało się wykonać operacji stat na %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Nie udało się odczytać dowiązania %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Archiwum nie posiada rekordu kontrolnego"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Archiwum nie posiadało pola pakietu"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nie posiada wpisu w pliku override\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  opiekunem %s jest %s, a nie %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nie posiada wpisu w pliku override źródeł\n"
+
+#: ftparchive/writer.cc:710
+#, 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:351 ftparchive/contents.cc:382
+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 %2$llu #1 pliku override %1$s"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Nieprawidłowa linia %2$llu #2 pliku override %1$s"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Nieprawidłowa linia %2$llu #3 pliku override %1$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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nie udało się zmienić nazwy %s na %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1921,17 +2320,6 @@ msgstr "Pakiet próbuje pisać do celu ominięcia %s/%s"
 msgid "The diversion path is too long"
 msgstr "Zbyt długa ścieżka ominięcia"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1960,30 +2348,36 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
 msgid "Unable to stat %s"
 msgstr "Nie można wykonać operacji stat na %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode wywołane na wciąż podłączonym węźle"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Nie udało się zamknąć pliku %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Nie udało się odnaleźć elementu tablicy haszującej!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Nie udało się utworzyć ominięcia"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Błąd wewnętrzny w AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\""
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Próba nadpisania ominięcia, %s -> %s i %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Podwójne dodanie ominięcia %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Zduplikowany plik konfiguracyjny %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -2031,197 +2425,52 @@ msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Nieznany typ nagłówka TAR %u, składnik %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Uruchamianie dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "System pakietów \"%s\" nie jest obsługiwany"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Zapisano %i rekordów.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Błędna suma kontrolna dla: %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/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."
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Pusty magazyn podręczny pakietów"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Magazyn podręczny pakietów jest uszkodzony"
-
-#: 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:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Magazyn podręczny pakietów jest uszkodzony - jest zbyt mały"
+msgid "List directory %spartial is missing."
+msgstr "Brakuje katalogu list %spartial."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Wymaga"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Wymaga wstępnie"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Sugeruje"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Poleca"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "W konflikcie z"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Zastępuje"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Dezaktualizuje"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Narusza zależności"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Rozszerza"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "ważny"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "wymagany"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standardowy"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opcjonalny"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "dodatkowy"
+msgid "Archives directory %spartial is missing."
+msgstr "Brakuje katalogu archiwów %spartial."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nie udało się odnaleźć sterownika metody %s."
+msgid "Unable to lock directory %s"
+msgstr "Nie udało się zablokować katalogu %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nie uruchomiła się poprawnie"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
 
-#: 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/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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie udało się otworzyć pliku stanu %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Pobieranie pliku %li z %li (pozostało %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
+msgid "Retrieving file %li of %li"
+msgstr "Pobieranie pliku %li z %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2241,7 +2490,7 @@ msgstr "Błędny rozmiar"
 msgid "Invalid file format"
 msgstr "Nieprawidłowa operacja %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2250,16 +2499,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2268,12 +2517,12 @@ msgstr ""
 "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
 "repozytorium nie będą wykonywane."
 
-#: apt-pkg/acquire-item.cc:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2283,12 +2532,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:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "BÅ‚Ä…d GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2297,180 +2546,133 @@ 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, 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/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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)"
-
-#: 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: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: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ć."
+msgid "The method driver %s could not be found."
+msgstr "Nie udało się odnaleźć sterownika metody %s."
 
-#: 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/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/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nie uruchomiła się poprawnie"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, 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"
+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/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/algorithms.cc:265
+#, 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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Zbieranie zapewnień plików"
+#: 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/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/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/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/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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Blok producenta %s nie zawiera odcisku"
+#: 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."
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Brakuje katalogu list %spartial."
+#: 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/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Brakuje katalogu archiwów %spartial."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nie udało się zablokować katalogu %s"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Pobieranie pliku %li z %li (pozostało %s)"
+msgid "Couldn't find task '%s'"
+msgstr "Nie udało się odnaleźć zadania \"%s\""
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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."
+msgid "Couldn't find any package by regex '%s'"
 msgstr ""
-"Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub "
-"użyto ich starszej wersji."
+"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
 
-#: 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/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/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Nie udało się wykonać operacji stat na pliku %s."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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"
+"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
+"ponieważ nie ma żadnej z nich"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 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)"
+"Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on "
+"czysto wirtualny"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nie udało się skonfigurować \"%s\". "
+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/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest "
+"zainstalowany"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2554,57 +2756,88 @@ msgstr "Zapisywanie nowej listy źródeł\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Źródła dla tej płyty to:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Nie udało się wykonać operacji stat na pliku %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Budowanie drzewa zależności"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "KandydujÄ…ce wersje"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generowanie zależności"
+
+#: 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 "Failed to open StateFile %s"
+msgstr "Nie udało się otworzyć pliku stanu %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Przygotowywanie na otrzymanie rozwiÄ…zania"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 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:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Zapisano %i rekordów.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Błędna suma kontrolna dla: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2631,6 +2864,219 @@ msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Nieprawidłowy wpis Date w pliku Release %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "System pakietów \"%s\" nie jest obsługiwany"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Uruchamianie dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nie udało się skonfigurować \"%s\". "
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Pusty magazyn podręczny pakietów"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Magazyn podręczny pakietów jest uszkodzony"
+
+#: 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: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: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: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:321
+msgid "Depends"
+msgstr "Wymaga"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Wymaga wstępnie"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Sugeruje"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Poleca"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "W konflikcie z"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Zastępuje"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Dezaktualizuje"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Narusza zależności"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Rozszerza"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "ważny"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "wymagany"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standardowy"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcjonalny"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "dodatkowy"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Zbieranie zapewnień plików"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2708,250 +3154,144 @@ msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
 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/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:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nie udało się odnaleźć zadania \"%s\""
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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: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\""
+msgid "Unable to parse package file %s (1)"
+msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
-"ponieważ nie ma żadnej z nich"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on "
-"czysto wirtualny"
+"Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub "
+"użyto ich starszej wersji."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blok producenta %s nie zawiera odcisku"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "Instalowanie %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/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "Konfigurowanie %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opcja linii poleceń \"%c\" [z %s] jest nieznana."
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Usuwanie %s"
+msgid "Command line option %s is not understood"
+msgstr "Niezrozumiała opcja linii poleceń %s"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "Całkowite usuwanie %s"
+msgid "Command line option %s is not boolean"
+msgstr "Opcja linii poleceń %s nie jest typu logicznego"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Proszę odnotować zniknięcie %s"
+msgid "Option %s requires an argument."
+msgstr "Opcja %s wymaga argumentu."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Uruchamianie wyzwalacza post-installation %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawierać =<wartość>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Brakuje katalogu \"%s\""
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Opcja %s wymaga argumentu typu całkowitego, nie \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Nie udało się otworzyć pliku \"%s\""
+msgid "Option '%s' is too long"
+msgstr "Opcja \"%s\" jest zbyt długa"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Przygotowywanie %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Znaczenie %s jest nieznane, proszę spróbować true lub false."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Rozpakowywanie %s"
+msgid "Invalid operation %s"
+msgstr "Nieprawidłowa operacja %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Przygotowywanie do konfiguracji %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Nierozpoznany skrót typu: \"%c\""
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "Pakiet %s został zainstalowany"
+msgid "Opening configuration file %s"
+msgstr "Otwieranie pliku konfiguracyjnego %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Przygotowywanie do usunięcia %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "Pakiet %s został usunięty"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Błąd składniowy %s:%u: Błędny znacznik"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Przygotowywanie do całkowitego usunięcia %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Pakiet %s został całkowicie usunięty"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "Operacja została przerwana, zanim mogła zostać zakończona"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
-"przyczyna niepowodzenia leży w poprzednim błędzie."
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
-"przepełnienie dysku"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
-"braku wolnej pamięci"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
-"przepełnienie dysku"
+"Błąd składniowy %s:%u: Dyrektywy mogą występować tylko na najwyższym poziomie"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Nie udało się zablokować katalogu administracyjnego (%s), czy inny proces go "
-"używa?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Błąd składniowy %s:%u: Włączony tutaj"
 
-# Musi pasować do su i sudo.
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Nie udało się zablokować katalogu administracyjnego (%s), czy użyto "
-"uprawnień administratora?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\""
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem."
+"Błąd składniowy %s:%u: czysta dyrektywa wymaga drzewa opcji jako argumentu"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Niezablokowany"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3071,54 +3411,11 @@ msgstr "Problem przy odlinkowywaniu pliku %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Nie odnaleziono wyboru %s"
+msgid "No keyring installed in %s."
+msgstr "Brak zainstalowanej bazy kluczy w %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3176,522 +3473,236 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Błąd składniowy %s:%u: Włączony tutaj"
+msgid "%c%s... Error!"
+msgstr "%c%s... BÅ‚Ä…d!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\""
+msgid "%c%s... Done"
+msgstr "%c%s... Gotowe"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Gotowe"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Opcja %s wymaga argumentu."
+msgid "%lid %lih %limin %lis"
+msgstr "%lidni %lig %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawierać =<wartość>."
+msgid "%lih %limin %lis"
+msgstr "%lig %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Opcja %s wymaga argumentu typu całkowitego, nie \"%s\""
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opcja \"%s\" jest zbyt długa"
+msgid "%lis"
+msgstr "%lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Znaczenie %s jest nieznane, proszę spróbować true lub false."
+msgid "Selection %s not found"
+msgstr "Nie odnaleziono wyboru %s"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Lista rozszerzeń pakietów jest zbyt długa"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "BÅ‚Ä…d przetwarzania katalogu %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista rozszerzeń źródeł jest zbyt długa"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości"
+"Nie udało się zablokować katalogu administracyjnego (%s), czy inny proces go "
+"używa?"
 
-#: ftparchive/apt-ftparchive.cc:431
+# Musi pasować do su i sudo.
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Błąd podczas przetwarzania zawartości %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-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 "Unable to lock the administration directory (%s), are you root?"
 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:841
-msgid "No selections matched"
-msgstr "Nie dopasowano żadnej nazwy"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old"
+"Nie udało się zablokować katalogu administracyjnego (%s), czy użyto "
+"uprawnień administratora?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Baza jest przestarzała, próbuję zaktualizować %s"
-
-#: ftparchive/cachedb.cc:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę "
-"usunąć i utworzyć ponownie bazę danych."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nie udało się otworzyć pliku bazy %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nie udało się odczytać dowiązania %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Archiwum nie posiada rekordu kontrolnego"
-
-#: ftparchive/cachedb.cc:594
-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"
+"dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem."
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Przejście po drzewie nie powiodło się"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Niezablokowany"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "Nie udało się otworzyć %s"
+msgid "Installing %s"
+msgstr "Instalowanie %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Odłączenie %s [%s]\n"
+msgid "Configuring %s"
+msgstr "Konfigurowanie %s"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Nie udało się odczytać dowiązania %s"
+msgid "Removing %s"
+msgstr "Usuwanie %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Nie udało się usunąć %s"
+msgid "Completely removing %s"
+msgstr "Całkowite usuwanie %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nie udało się dowiązać %s do %s"
+msgid "Noting disappearance of %s"
+msgstr "Proszę odnotować zniknięcie %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archiwum nie posiadało pola pakietu"
+msgid "Running post-installation trigger %s"
+msgstr "Uruchamianie wyzwalacza post-installation %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nie posiada wpisu w pliku override\n"
+msgid "Directory '%s' missing"
+msgstr "Brakuje katalogu \"%s\""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  opiekunem %s jest %s, a nie %s\n"
+msgid "Could not open file '%s'"
+msgstr "Nie udało się otworzyć pliku \"%s\""
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nie posiada wpisu w pliku override źródeł\n"
+msgid "Preparing %s"
+msgstr "Przygotowywanie %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nie udało się zaalokować pamięci"
+msgid "Unpacking %s"
+msgstr "Rozpakowywanie %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, 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"
+msgid "Preparing to configure %s"
+msgstr "Przygotowywanie do konfiguracji %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nie udało się czytać pliku override %s"
+msgid "Installed %s"
+msgstr "Pakiet %s został zainstalowany"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
+msgid "Preparing for removal of %s"
+msgstr "Przygotowywanie do usunięcia %s"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Nieprawidłowa linia %llu #2 pliku override %s"
+msgid "Removed %s"
+msgstr "Pakiet %s został usunięty"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Nieprawidłowa linia %llu #3 pliku override %s"
+msgid "Preparing to completely remove %s"
+msgstr "Przygotowywanie do całkowitego usunięcia %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Nieznany algorytm kompresji \"%s\""
+msgid "Completely removed %s"
+msgstr "Pakiet %s został całkowicie usunięty"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nie udało się pisać do %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Nie udało się utworzyć obiektu FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Nie udało się utworzyć procesu potomnego"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Potomny proces kompresujÄ…cy"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "Operacja została przerwana, zanim mogła zostać zakończona"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Błąd wewnętrzny, nie udało się utworzyć %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Zawiodła operacja IO na pliku/podprocesie"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
+"przyczyna niepowodzenia leży w poprzednim błędzie."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem przy usuwaniu %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
+"przepełnienie dysku"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
+"braku wolnej pamięci"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nieznane informacje o pakiecie!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
+"przepełnienie dysku"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
+"wejścia/wyjścia dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade"
 
 #~ 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 4c53b49ef..5dcd74bb5 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -97,77 +97,77 @@ msgstr "Espaço total contabilizado: "
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro do pacote %s está dessincronizado."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Tem de fornecer pelo menos um padrão de busca"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 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:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Ficheiros de Pacotes :"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Pacotes Marcados:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Marcação do Pacote: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Tabela de Versão:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -328,7 +328,7 @@ msgid "Couldn't find package %s"
 msgstr "Impossível encontrar o pacote %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s está definido para ser instalado manualmente.\n"
@@ -358,7 +358,7 @@ msgstr "Impossível criar acesso exclusivo ao directório de downloads"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, 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"
@@ -390,7 +390,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Não foi possível determinar o espaço livre em %s"
@@ -423,7 +423,7 @@ msgstr "Obter código fonte %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Falhou obter alguns arquivos."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Download completo e em modo de fazer apenas o download"
 
@@ -433,32 +433,32 @@ 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "O comando de descompactação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "O comando de compilação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "O processo filho falhou"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -467,18 +467,18 @@ msgstr ""
 "Nenhuma informação de arquitectura disponível para %s. Para configuração "
 "veja apt.conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de compilação.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +487,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:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +496,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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +512,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,30 +521,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Falhou processar as dependências de compilação"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changlog para %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -634,16 +634,20 @@ msgstr ""
 "apt-get(8), sources.list(5) e apt.conf(5)\n"
 "                         Este APT tem Poderes de Super Vaca.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -652,6 +656,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -681,8 +686,9 @@ msgstr "%s já estava marcado para manter.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s já estava para não manter.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperou por %s mas não estava lá"
@@ -897,7 +903,7 @@ msgstr "Não foi possível criar um socket"
 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Falhou"
 
@@ -943,7 +949,7 @@ msgstr "Ligação de socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar ligação"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
@@ -1077,112 +1083,202 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Ficheiros vazios não podem ser arquivos válidos"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Erro ao escrever para o ficheiro"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Erro ao escrever para ficheiro"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "A selecção falhou"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "O tempo da ligação expirou"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Erro ao escrever para o ficheiro de saída"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "A aguardar por cabeçalhos"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Linha de cabeçalho errada"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte de range errado"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "A ligação falhou"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Hit "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Obter:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [A trabalhar]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Troca de mídia: Por favor insira o disco chamado\n"
+" '%s'\n"
+"no leitor '%s' e pressione enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Aviso de autenticação ultrapassado.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Alguns pacotes não puderam ser autenticados"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Instalar estes pacotes sem verificação?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Há problemas e foi utilizado -y sem --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Falhou obter %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro Interno, Ordering não terminou"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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"
 
 #. 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
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1190,31 +1286,27 @@ 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
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Sim, faça como eu digo!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1225,19 +1317,19 @@ msgstr ""
 "Para continuar escreva a frase '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Abortado."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Deseja continuar?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Falhou o download de alguns ficheiros"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1245,19 +1337,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:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Não foi possível corrigir os pacotes em falta."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "A abortar a instalação."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1271,15 +1363,15 @@ msgstr[1] ""
 "Os seguintes pacotes desapareceram do seu sistema pois\n"
 "todos os ficheiros foram  por outros pacotes:"
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1297,15 +1389,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover estragou coisas"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1317,7 +1409,7 @@ msgstr[1] ""
 "Os seguintes pacotes foram instalados automaticamente e já não são "
 "necessários:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1326,7 +1418,7 @@ 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:518
+#: apt-private/private-install.cc:519
 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."
@@ -1344,7 +1436,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:628
+#: apt-private/private-install.cc:638
 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,72 +1448,72 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Pacotes estragados"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Os seguintes pacotes extra serão instalados:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Saltando %s, não está instalado e só são pedidas actualizações.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "A reinstalação de %s não é possível, o download do mesmo não pode ser "
 "feito.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s já está na versão mais recente.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versão seleccionada '%s' (%s) para '%s'\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versão seleccionada '%s' (%s) para '%s' devido a '%s'\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "O pacote '%s' não está instalado, por isso não será removido. Queria dizer "
 "'%s'?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "O pacote '%s' não está instalado, por isso não será removido\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1429,136 +1521,120 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "mas %s está instalado"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mas %s está para ser instalado"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "mas não é instalável"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "mas é um pacote virtual"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "mas não está instalado"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "mas não vai ser instalado"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " ou"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Serão instalados os seguintes NOVOS pacotes:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Serão REMOVIDOS os seguintes pacotes:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 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:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Serão actualizados os seguintes pacotes:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Os seguintes pacotes mantidos serão mudados:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (devido a %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1566,27 +1642,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu a que foi feito o downgrade, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
@@ -1595,7 +1671,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[S/n]"
 
@@ -1603,36 +1679,28 @@ msgstr "[S/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1646,39 +1714,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Aviso de autenticação ultrapassado.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Alguns pacotes não puderam ser autenticados"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Instalar estes pacotes sem verificação?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Falhou obter %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1689,74 +1724,44 @@ msgstr "Falha ao baixar %s  %s\n"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Pronto"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Hit "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Obter:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [A trabalhar]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Troca de mídia: Por favor insira o disco chamado\n"
-" '%s'\n"
-"no leitor '%s' e pressione enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, 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/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1834,36 +1839,429 @@ msgstr ""
 msgid "Merging available information"
 msgstr "A juntar a informação disponível"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode chamado em nó ainda linkado"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Falha ao localizar o elemento de hash!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Não foi possível fazer stat %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Falha ao alocar desvio (diversion)"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Não conseguiu escrever para %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Erro Interno em AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "A lista de extensão de pacotes é demasiado longa"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "A tentar sobrescrever um desvio, %s -> %s e %s/%s"
+msgid "Error processing directory %s"
+msgstr "Erro ao processar o directório %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Lista de extensão de códigos-fonte é demasiado longa"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Adição dupla de desvio %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Erro ao processar o conteúdo %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Nenhuma selecção coincidiu"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Arquivo de configuração duplicado %s/%s"
+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:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "A base de dados é antiga, a tentar actualizar %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, 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:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Falha stat %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Falhou o readlink %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "O arquivo não tem registo de controlo"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Arquivo não possuía campo package"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s não possui entrada override\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr " o maintainer de %s é %s, não %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s não possui fonte de entrada de 'override'\n"
+
+#: ftparchive/writer.cc:710
+#, 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:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Falhou renomear %s para %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1889,17 +2287,6 @@ msgstr "O pacote está a tentar escrever no alvo de desvio %s/%s"
 msgid "The diversion path is too long"
 msgstr "O caminho de desvio é muito longo"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1928,30 +2315,36 @@ msgstr "O ficheiro %s/%s substitui o que está no pacote %s"
 msgid "Unable to stat %s"
 msgstr "Não foi possível fazer stat %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode chamado em nó ainda linkado"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Falhou fechar o ficheiro %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Falha ao localizar o elemento de hash!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Falha ao alocar desvio (diversion)"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Erro Interno em AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, 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'"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "A tentar sobrescrever um desvio, %s -> %s e %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Erro Interno, não foi possível localizar o membro %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Adição dupla de desvio %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ficheiro de controle não interpretável"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Arquivo de configuração duplicado %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1999,203 +2392,52 @@ msgstr "A soma de controlo do tar falhou, arquivo corrompido"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "A correr o dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Sistema de empacotamento '%s' não é suportado"
-
-#: 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"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Escreveu %i registos.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
+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-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Erro Interno, não foi possível localizar o membro %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Não foi possível encontrar registo de autenticação para: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Ficheiro de controle não interpretável"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash não coincide para: %s"
-
-#: apt-pkg/cachefile.cc:94
-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: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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Cache de pacotes vazia"
-
-#: 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: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:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "O ficheiro de cache de pacotes está corrompido, é demasiado pequeno"
+msgid "List directory %spartial is missing."
+msgstr "Falta directório de listas %spartial."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Depende"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Pré-Depende"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Sugere"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Recomenda"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Em Conflito"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Substitui"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Obsoleta"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Estraga"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Aumenta"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "importante"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "necessário"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "padrão"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opcional"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Archives directory %spartial is missing."
+msgstr "Falta o directório de arquivos %spartial."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "O driver do método %s não pôde ser encontrado."
+msgid "Unable to lock directory %s"
+msgstr "Impossível criar acesso exclusivo ao directório %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Tipo do ficheiro de índice '%s' não é suportado"
 
-#: 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/depcache.cc:250
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falhou abrir o StateFile %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "A obter o ficheiro %li de %li (%s restantes)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha escrever ficheiro temporário StateFile %s"
+msgid "Retrieving file %li of %li"
+msgstr "A obter o ficheiro %li de %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2215,7 +2457,7 @@ msgstr "Tamanho incorrecto"
 msgid "Invalid file format"
 msgstr "Operação %s inválida"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2224,18 +2466,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2244,12 +2486,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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2260,12 +2502,12 @@ msgstr ""
 "GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Erro GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2275,12 +2517,12 @@ msgstr ""
 "significar que você precisa corrigir manualmente este pacote. (devido a "
 "arquitectura em falta)"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2288,172 +2530,123 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "A cache possui um sistema de versões incompatível"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pôde ser encontrado."
 
-#. 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
+#: 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/acquire-worker.cc:169
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Ocorreu um erro ao processar %s (%s%d)"
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou correctamente"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
-"suportar."
+"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: 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 ""
-"Uau, você excedeu o número de versões que este APT é capaz de suportar."
+"O pacote %s necessita ser reinstalado, mas não foi possível encontrar um "
+"repositório para o mesmo."
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
-"Uau, você excedeu o número de descrições que este APT é capaz de suportar."
+"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
+"pacotes mantidos (hold)."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
-"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
+"Não foi possível corrigir problemas, você tem pacotes mantidos (hold) "
+"estragados."
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
-
-#: 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: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:1316
-msgid "Collecting File Provides"
-msgstr "A obter File Provides"
+"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou "
+"aberto."
 
-#: 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/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"
 
-#: 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/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/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "O bloco de fabricante %s não contém a impressão digital"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Não foi encontrado o Release '%s' para '%s'"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "Falta directório de listas %spartial."
+msgid "Version '%s' for '%s' was not found"
+msgstr "Não foi encontrada a versão '%s' para '%s'"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Falta o directório de arquivos %spartial."
+msgid "Couldn't find task '%s'"
+msgstr "Não foi possível encontrar a tarefa '%s'"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossível criar acesso exclusivo ao directório %s"
+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'"
 
-#. 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 "A obter o ficheiro %li de %li (%s restantes)"
+#: 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/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, c-format
-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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 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/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Não foi possível fazer stat %s."
+"Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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)"
+"Não pode seleccionar a versão instalada nem a versão candidata do pacote "
+"'%s' pois não tem nenhuma destas"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 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)"
+"Não foi possível seleccionar a versão mais recente a partir do pacote '%s' "
+"já que é puramente virtual"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "Não pode configurar '%s'. "
+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/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"Não é possível seleccionar a versão instalada do pacote %s pois não está "
+"instalado"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2537,57 +2730,88 @@ msgstr "A escrever lista de novas source\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas de listas de Source para este Disco são:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Não foi possível fazer stat %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "A construir árvore de dependências"
 
-#: 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: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/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falhou abrir o StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha escrever ficheiro temporário StateFile %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Enviar cenário a resolver"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Enviar pedido para resolvedor"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Preparar para receber solução"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Executar resolvedor externo"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Escreveu %i registos.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Não foi possível encontrar registo de autenticação para: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash não coincide para: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2614,6 +2838,224 @@ msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Sistema de empacotamento '%s' não é suportado"
+
+#: 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"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "A correr o dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Não pode configurar '%s'. "
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Cache de pacotes vazia"
+
+#: 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: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: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: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: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:321
+msgid "Depends"
+msgstr "Depende"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Pré-Depende"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Sugere"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Recomenda"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Em Conflito"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Substitui"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Obsoleta"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Estraga"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Aumenta"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "importante"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "necessário"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "padrão"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcional"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "A obter File Provides"
+
+#: 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/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/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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2692,247 +3134,145 @@ msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 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/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: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:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Não foi possível encontrar a tarefa '%s'"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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: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'"
+msgid "Unable to parse package file %s (1)"
+msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+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:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-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:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Não foi possível seleccionar a versão mais recente a partir do pacote '%s' "
-"já que é puramente virtual"
+"Falhou o download de alguns ficheiros de índice. Foram ignorados ou os "
+"antigos foram usados em seu lugar."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "O bloco de fabricante %s não contém a impressão digital"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Impossível executar stat ao ponto de montagem %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "A instalar %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Impossível executar stat ao cdrom"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "A configurar %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opção '%c' da linha de comandos [de %s] é desconhecida."
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "A remover %s"
+msgid "Command line option %s is not understood"
+msgstr "Opção %s de linha de comandos não é compreendida"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "A remover completamente %s"
+msgid "Command line option %s is not boolean"
+msgstr "Opção %s da linha de comandos não é booleana"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "A notar o desaparecimento de %s"
+msgid "Option %s requires an argument."
+msgstr "A opção %s necessita de um argumento."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "A correr o 'trigger' de pós-instalação %s"
+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>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Falta o directório '%s'"
+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/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Não foi possível abrir ficheiro o '%s'"
+msgid "Option '%s' is too long"
+msgstr "Opção '%s' é demasiado longa"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "A preparar %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "O sentido %s não é compreendido, tente verdadeiro ou falso."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "A desempacotar %s"
+msgid "Invalid operation %s"
+msgstr "Operação %s inválida"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "A preparar para configurar %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Abreviatura de tipo desconhecida: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "%s instalado"
+msgid "Opening configuration file %s"
+msgstr "A abrir o ficheiro de configuração %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "A preparar a remoção de %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "%s removido"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Erro de sintaxe %s:%u: Tag mal formada"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "A preparar para remover completamente %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Remoção completa de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "A operação foi interrompida antes de poder terminar"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemas de dependências - deixando por configurar"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
-"cheio"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
-"memória esgotada"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
-"cheio"
+"Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Não foi possível obter acesso exclusivo ao directório de administração (%s), "
-"outro processo está a utilizá-lo?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Não foi possível criar acesso exclusivo ao directório de administração (%s), "
-"é root?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"O dpkg foi interrompido, para corrigir o problema tem de correr manualmente "
-"'%s'"
+"Erro de sintaxe %s:%u: directiva clara necessita de uma árvore de opções "
+"como argumento"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Sem acesso exclusivo"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3055,54 +3395,11 @@ msgstr "Problema ao remover o link do ficheiro %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "A selecção %s não foi encontrada"
+msgid "No keyring installed in %s."
+msgstr "Nenhum keyring instalado em %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3160,522 +3457,236 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
+msgid "%c%s... Error!"
+msgstr "%c%s... Erro !"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada"
+msgid "%c%s... Done"
+msgstr "%c%s... Pronto"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Pronto"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "A opção %s necessita de um argumento."
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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>."
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, 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'"
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opção '%s' é demasiado longa"
+msgid "%lis"
+msgstr "%lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "O sentido %s não é compreendido, tente verdadeiro ou falso."
+msgid "Selection %s not found"
+msgstr "A selecção %s não foi encontrada"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "A lista de extensão de pacotes é demasiado longa"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Erro ao processar o directório %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista de extensão de códigos-fonte é demasiado longa"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo"
+"Não foi possível obter acesso exclusivo ao directório de administração (%s), "
+"outro processo está a utilizá-lo?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Erro ao processar o conteúdo %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-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 "Unable to lock the administration directory (%s), are you root?"
 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:841
-msgid "No selections matched"
-msgstr "Nenhuma selecção coincidiu"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old"
+"Não foi possível criar acesso exclusivo ao directório de administração (%s), "
+"é root?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "A base de dados é antiga, a tentar actualizar %s"
-
-#: ftparchive/cachedb.cc:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:99
-#, 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:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Falhou o readlink %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "O arquivo não tem registo de controlo"
-
-#: ftparchive/cachedb.cc:594
-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"
+"O dpkg foi interrompido, para corrigir o problema tem de correr manualmente "
+"'%s'"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Falhou ao percorrer a árvore"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Sem acesso exclusivo"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "Falhou abrir %s"
+msgid "Installing %s"
+msgstr "A instalar %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Configuring %s"
+msgstr "A configurar %s"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Falhou o readlink %s"
+msgid "Removing %s"
+msgstr "A remover %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Falhou o unlink %s"
+msgid "Completely removing %s"
+msgstr "A remover completamente %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Falhou ligar %s a %s"
+msgid "Noting disappearance of %s"
+msgstr "A notar o desaparecimento de %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Limite DeLink de %sB atingido.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arquivo não possuía campo package"
+msgid "Running post-installation trigger %s"
+msgstr "A correr o 'trigger' de pós-instalação %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s não possui entrada override\n"
+msgid "Directory '%s' missing"
+msgstr "Falta o directório '%s'"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " o maintainer de %s é %s, não %s\n"
+msgid "Could not open file '%s'"
+msgstr "Não foi possível abrir ficheiro o '%s'"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s não possui fonte de entrada de 'override'\n"
+msgid "Preparing %s"
+msgstr "A preparar %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Falhou alocar memória"
+msgid "Unpacking %s"
+msgstr "A desempacotar %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, 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"
+msgid "Preparing to configure %s"
+msgstr "A preparar para configurar %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Falhou ler o ficheiro override %s"
+msgid "Installed %s"
+msgstr "%s instalado"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Override %s malformado linha %llu #1"
+msgid "Preparing for removal of %s"
+msgstr "A preparar a remoção de %s"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Override %s malformado linha %llu #2"
+msgid "Removed %s"
+msgstr "%s removido"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Override %s malformado linha %llu #3"
+msgid "Preparing to completely remove %s"
+msgstr "A preparar para remover completamente %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo de compressão desconhecido '%s'"
+msgid "Completely removed %s"
+msgstr "Remoção completa de %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"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Não conseguiu escrever para %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Falhou criar FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Falhou o fork"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Compactar filho"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "A operação foi interrompida antes de poder terminar"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Erro Interno, falhou criar %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Falhou o IO para subprocesso/arquivo"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemas de dependências - deixando por configurar"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Falhou ler durante o cálculo de MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro "
+"de seguimento de um erro anterior."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema ao executar unlinking %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
+"cheio"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
+"memória esgotada"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Registo de pacote desconhecido!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
+"cheio"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de I/"
+"O do dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Erro Interno, AllUpgrade estragou algo"
 
 #~ 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 82bc3a2f1..c23a42275 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
 
 #: cmdline/apt-cache.cc:149
 #, c-format
@@ -97,77 +98,77 @@ msgstr "Total de espaço contabilizado para: "
 msgid "Package file %s is out of sync."
 msgstr "O arquivo de pacote %s está fora de sincronia."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Você deve passar exatamente um padrão"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossível encontrar o pacote %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Arquivos de pacote:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Pacotes alfinetados (\"pinned\"):"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Pacote alfinetado (\"pin\"): "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Tabela de versão:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -334,7 +335,7 @@ msgid "Couldn't find package %s"
 msgstr "Impossível achar pacote %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
@@ -362,7 +363,7 @@ msgstr "Impossível criar trava no diretório de download"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossível encontrar um pacote fonte para %s"
@@ -388,7 +389,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pulando arquivo já baixado '%s'\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Não foi possível determinar o espaço livre em %s"
@@ -421,7 +422,7 @@ msgstr "Obter fonte %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Falhou ao buscar alguns arquivos."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Baixar completo e no modo somente baixar (\"download only\")"
 
@@ -430,49 +431,49 @@ msgstr "Baixar completo e no modo somente baixar (\"download only\")"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando de desempacotamento '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando de construção '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Processo filho falhou"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de construção.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -481,7 +482,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:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -490,14 +491,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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -506,7 +507,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:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -515,30 +516,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Falhou ao processar as dependências de construção"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectando em %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -626,16 +627,20 @@ msgstr ""
 "para mais informações e opções.\n"
 "                       Este APT tem Poderes de Super Vaca.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -644,6 +649,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -673,8 +679,9 @@ msgstr "%s já é a versão mais nova.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s já é a versão mais nova.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperado %s mas este não estava lá"
@@ -868,7 +875,7 @@ msgstr "Não foi possível criar um socket"
 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Falhou"
 
@@ -914,7 +921,7 @@ msgstr "Conexão do socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar conexão"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problema criando o hash do arquivo"
 
@@ -1049,91 +1056,181 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Erro escrevendo para o arquivo"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Erro escrevendo para arquivo"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Seleção falhou"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Conexão expirou"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Erro escrevendo para arquivo de saída"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Aguardando por cabeçalhos"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Linha de cabeçalho ruim"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Dados de cabeçalho ruins"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Atingido "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Obter:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Trabalhando]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Troca de mídia: por favor, insira o disco nomeado\n"
+" '%s'\n"
+"na unidade '%s' e pressione enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Aviso de autenticação sobreposto.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Alguns pacotes não puderam ser autenticados"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Instalar estes pacotes sem verificação?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Há problemas e -y foi usado sem --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Falhou ao buscar %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, Ordenação não finalizou"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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."
@@ -1141,21 +1238,21 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1163,31 +1260,27 @@ 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
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Sim, faça o que eu digo!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1198,19 +1291,19 @@ msgstr ""
 "Para continuar digite a frase '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Abortar."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Alguns arquivos falharam ao baixar"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1218,19 +1311,19 @@ msgstr ""
 "Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar "
 "com --fix-missing?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Impossível corrigir pacotes faltantes."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Abortando instalação."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1240,15 +1333,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1266,15 +1359,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover quebrou coisas"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1288,7 +1381,7 @@ msgstr[1] ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1300,7 +1393,7 @@ msgstr[1] ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1319,7 +1412,7 @@ msgstr ""
 "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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,68 +1424,68 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Os pacotes extra a seguir serão instalados:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s já é a versão mais nova.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versão selecionada %s (%s) para %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versão selecionada %s (%s) para %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "O pacote %s não está instalado, então não será removido\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "O pacote %s não está instalado, então não será removido\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1400,136 +1493,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências desencontradas:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "mas %s está instalado"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mas %s está para ser instalado"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "mas não é instalável"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "mas é um pacote virtual"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "mas não está instalado"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "mas não será instalado"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " ou"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências desencontradas:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Os NOVOS pacotes a seguir serão instalados:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Os pacotes a seguir serão REMOVIDOS:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 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:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Os pacotes a seguir serão atualizados:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Os pacotes a seguir serão REVERTIDOS:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Os seguintes pacotes mantidos serão mudados:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por causa de %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1538,27 +1611,27 @@ msgstr ""
 "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
 "fazendo!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu revertidos, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
@@ -1567,7 +1640,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[S/n]"
 
@@ -1575,36 +1648,28 @@ msgstr "[S/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1618,35 +1683,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Aviso de autenticação sobreposto.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Alguns pacotes não puderam ser autenticados"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Instalar estes pacotes sem verificação?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Falhou ao buscar %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1657,74 +1693,44 @@ msgstr "Falha ao baixar %s  %s\n"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Pronto"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atingido "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Obter:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Trabalhando]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Troca de mídia: por favor, insira o disco nomeado\n"
-" '%s'\n"
-"na unidade '%s' e pressione enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossível ler %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1804,36 +1810,433 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente"
 msgid "Merging available information"
 msgstr "Mesclando informação disponível"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "\"DropNode\" chamado em nó ainda ligado (\"linked\")"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Falhou ao localizar o elemento hash!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Impossível executar \"stat\" em %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Falhou ao alocar desvio (\"diversion\")"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Impossível escrever para %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Erro interno em \"AddDiversion\""
+#: 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?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Lista de extensão de pacotes é muito extensa"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s"
+msgid "Error processing directory %s"
+msgstr "Erro processando o diretório %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Lista de extensão de fontes é muito extensa"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Adição dupla de desvio %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Erro processando conteúdo %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Nenhuma seleção combinou"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Arquivo de configuração duplicado %s/%s"
+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:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "BD estava corrompido, arquivo renomeado para %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "BD é antigo, tentando atualizar %s"
+
+#: ftparchive/cachedb.cc:94
+#, 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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Impossível abrir o arquivo BD %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Falhou ao executar \"stat\" %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Falhou ao executar \"readlink\" %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Repositório não possui registro de controle"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Repositório não possuía campo pacote"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s não possui entrada override\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  mantenedor de %s é %s, não %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s não possui entrada override fonte\n"
+
+#: ftparchive/writer.cc:710
+#, 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:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Falhou ao renomear %s para %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1859,17 +2262,6 @@ msgstr "O pacote está tentando escrever no alvo do desvio %s/%s"
 msgid "The diversion path is too long"
 msgstr "O caminho de desvio é muito longo"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1898,30 +2290,36 @@ msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
 msgid "Unable to stat %s"
 msgstr "Impossível executar \"stat\" em %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "\"DropNode\" chamado em nó ainda ligado (\"linked\")"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Falhou ao fechar arquivo %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Falhou ao localizar o elemento hash!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Falhou ao alocar desvio (\"diversion\")"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Erro interno em \"AddDiversion\""
+
+#: apt-inst/filelist.cc:477
 #, 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"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Erro interno, não foi possível localizar membro %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Adição dupla de desvio %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Arquivo de controle não interpretável"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Arquivo de configuração duplicado %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1969,203 +2367,52 @@ msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Sistema de empacotamento '%s' não é suportado"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Gravados %i registros.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Gravados %i registros com %i arquivos faltando.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Gravados %i registros com %i arquivos que não combinam\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Este não é um arquivo DEB válido, membro '%s' faltando"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Erro interno, não foi possível localizar membro %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Arquivo de controle não interpretável"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash Sum incorreto"
-
-#: 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/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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Cache de pacotes vazio"
-
-#: 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: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: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: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: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:321
-msgid "Depends"
-msgstr "Depende"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Pré-Depende"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Sugere"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Recomenda"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Conflita"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Substitui"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Obsoleta"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Quebra"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "importante"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "requerido"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "padrão"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opcional"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "O driver do método %s não pode ser encontrado."
+msgid "List directory %spartial is missing."
+msgstr "Diretório de listas %spartial está faltando."
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou corretamente"
+msgid "Archives directory %spartial is missing."
+msgstr "Diretório de arquivos %spartial está faltando."
 
-#: apt-pkg/acquire-worker.cc:455
-#, 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/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Impossível criar trava no diretório de listas"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "Tipo de arquivo de índice '%s' não é suportado"
 
-#: 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/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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Obtendo o arquivo %li de %li (%s restantes)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
+msgid "Retrieving file %li of %li"
+msgstr "Obtendo arquivo %li de %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2185,35 +2432,35 @@ msgstr "Tamanho incorreto"
 msgid "Invalid file format"
 msgstr "Operação %s inválida"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2221,12 +2468,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2236,12 +2483,12 @@ msgstr ""
 "que você precisa consertar manualmente este pacote. (devido a arquitetura "
 "não especificada)."
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2249,169 +2496,112 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
 "\" para o pacote %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "O cache possui um sistema de versões incompatível"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pode ser encontrado."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
+msgid "Is the package %s installed?"
+msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou corretamente"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Uau, você excedeu o número de versões que este APT é capaz de suportar."
+"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: 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 ""
-"Uau, você excedeu o número de descrições que este APT é capaz de suportar."
+"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
+"arquivo para o mesmo."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
-"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
+"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
+"pacotes mantidos (hold)."
 
-#: 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/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/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/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/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/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"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Coletando Arquivo \"Provides\""
+#: 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release '%s' para '%s' não foi encontrada"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versão '%s' para '%s' não foi encontrada"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Diretório de listas %spartial está faltando."
+msgid "Couldn't find task '%s'"
+msgstr "Impossível achar tarefa %s"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Diretório de arquivos %spartial está faltando."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Impossível achar pacote %s"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr "Obtendo o arquivo %li de %li (%s restantes)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Impossível achar pacote %s"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, 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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os "
-"antigos foram usados no lugar."
 
-#: 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/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossível executar \"stat\" %s."
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, 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:444
+#: apt-pkg/cacheset.cc:647
 #, 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\""
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Não foi possível abrir arquivo %s"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2493,55 +2683,88 @@ msgstr "Gravando nova lista de fontes\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Entradas na lista de fontes para este disco são:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Impossível executar \"stat\" %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo árvore de dependências"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
+
+#: 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 "Failed to open StateFile %s"
+msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Gravados %i registros.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Impossível analisar arquivo de pacote %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Gravados %i registros com %i arquivos faltando.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Gravados %i registros com %i arquivos que não combinam\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum incorreto"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2568,6 +2791,220 @@ msgstr "Linha inválida no arquivo de desvios: %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Impossível analisar arquivo de pacote %s (1)"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Sistema de empacotamento '%s' não é suportado"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Não foi possível abrir arquivo %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Cache de pacotes vazio"
+
+#: 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: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: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: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: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:321
+msgid "Depends"
+msgstr "Depende"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Pré-Depende"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Sugere"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Recomenda"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Conflita"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Substitui"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Obsoleta"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Quebra"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "importante"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "requerido"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "padrão"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcional"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Coletando Arquivo \"Provides\""
+
+#: 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/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/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 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2648,221 +3085,146 @@ msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 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/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' para '%s' não foi encontrada"
+#: 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/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versão '%s' para '%s' não foi encontrada"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Impossível achar tarefa %s"
-
-#: 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:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Impossível achar pacote %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "Impossível analisar arquivo de pacote %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"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/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "Impossível executar \"stat\" no ponto de montagem %s"
 
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Impossível executar \"stat\" no cdrom"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "Instalando %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opção de linha de comando '%c' [de %s] é desconhecida."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "Configurando %s"
+msgid "Command line option %s is not understood"
+msgstr "Opção de linha de comando %s não é compreendida"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "Removendo %s"
+msgid "Command line option %s is not boolean"
+msgstr "Opção de linha de comando %s não é booleana"
 
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s completamente removido"
+#: 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/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
+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/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Executando gatilho pós-instalação %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Opção %s requer um argumento inteiro, não '%s'"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Diretório '%s' está faltando"
-
-#: 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"
+msgid "Option '%s' is too long"
+msgstr "Opção '%s' é muito longa"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Preparando %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Sentido %s não é compreendido, tente verdadeiro ou falso."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Desempacotando %s"
+msgid "Invalid operation %s"
+msgstr "Operação %s inválida"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Preparando para configurar %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Abreviação de tipo desconhecida: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "%s instalado"
+msgid "Opening configuration file %s"
+msgstr "Abrindo arquivo de configuração %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Preparando para a remoção de %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "%s removido"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Erro de sintaxe %s:%u: Tag mal formada"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Preparando para remover completamente %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s completamente removido"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Erro de sintaxe %s:%u: Não há suporte para a diretiva '%s'"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, 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:110
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+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/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2977,54 +3339,11 @@ msgstr "Problema removendo o arquivo"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Pronto"
-
-#. 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"
+msgid "No keyring installed in %s."
+msgstr "Abortando instalação."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3078,526 +3397,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Erro de sintaxe %s:%u: Tag mal formada"
+msgid "%c%s... Error!"
+msgstr "%c%s... Erro!"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
+msgid "%c%s... Done"
+msgstr "%c%s... Pronto"
 
-#: apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Pronto"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Opção %s requer um argumento."
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "%lih %limin %lis"
 msgstr ""
-"Opção %s: Especificação de item de configuração deve possuir um =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Opção %s requer um argumento inteiro, não '%s'"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opção '%s' é muito longa"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Sentido %s não é compreendido, tente verdadeiro ou falso."
+msgid "Selection %s not found"
+msgstr "Seleção %s não encontrada"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Lista de extensão de pacotes é muito extensa"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Erro processando o diretório %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista de extensão de fontes é muito extensa"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Impossível criar trava no diretório de listas"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Erro processando conteúdo %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Nenhuma seleção combinou"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "BD estava corrompido, arquivo renomeado para %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "BD é antigo, tentando atualizar %s"
 
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Impossível abrir o arquivo BD %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Falhou ao executar \"readlink\" %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Repositório não possui registro de controle"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Impossível obter um cursor"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Impossível ler o diretório %s\n"
+msgid "Installing %s"
+msgstr "Instalando %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, 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 "
+msgid "Configuring %s"
+msgstr "Configurando %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Falhou ao resolver %s"
+msgid "Removing %s"
+msgstr "Removendo %s"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Falhou ao percorrer a árvore"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s completamente removido"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "Falhou ao abrir %s"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "Executando gatilho pós-instalação %s"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Falhou ao executar \"readlink\" %s"
+msgid "Directory '%s' missing"
+msgstr "Diretório '%s' está faltando"
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Falhou ao executar \"unlink\" %s"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Não foi possível abrir arquivo %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Falhou ao ligar %s a %s"
+msgid "Preparing %s"
+msgstr "Preparando %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Limite DeLink de %sB atingido.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Repositório não possuía campo pacote"
+msgid "Unpacking %s"
+msgstr "Desempacotando %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s não possui entrada override\n"
+msgid "Preparing to configure %s"
+msgstr "Preparando para configurar %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  mantenedor de %s é %s, não %s\n"
+msgid "Installed %s"
+msgstr "%s instalado"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s não possui entrada override fonte\n"
+msgid "Preparing for removal of %s"
+msgstr "Preparando para a remoção de %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Falha ao alocar memória"
+msgid "Removed %s"
+msgstr "%s removido"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "Preparando para remover completamente %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "%s completamente removido"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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"
+msgid "Can not write log (%s)"
+msgstr "Impossível escrever para %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Falhou ao criar FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Falhou ao executar \"fork\""
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Compactar filho"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Erro interno, falhou ao criar %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "E/S para sub-processo/arquivo falhou"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Falhou ao ler durante o cálculo MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema removendo %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Erro interno, AllUpgrade quebrou coisas"
 
 #~ 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 712ba11de..2e556ef62 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -99,76 +99,76 @@ msgstr "Total spațiu contorizat pentru: "
 msgid "Package file %s is out of sync."
 msgstr "Fișierul pachetului %s este desincronizat."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Trebuie să dați exact un șablon"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 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:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Fișiere pachet: "
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Pachete alese special:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(negăsit)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Instalat: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Candidează: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(niciunul)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Pachet ales special: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Tabela de versiuni:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -331,7 +331,7 @@ msgid "Couldn't find package %s"
 msgstr "Nu pot găsi pachetul %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
@@ -360,7 +360,7 @@ msgstr "Nu s-a putut bloca directorul de descărcare"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
@@ -386,7 +386,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Sar peste fișierul deja descărcat '%s'\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "N-am putut determina spațiul disponibil în %s"
@@ -419,7 +419,7 @@ msgstr "Aducere sursa %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Eșec la aducerea unor arhive."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Descărcare completă și în modul doar descărcare"
 
@@ -428,49 +428,49 @@ msgstr "Descărcare completă și în modul doar descărcare"
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comanda de despachetare '%s' eșuată.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comanda de construire '%s' eșuată.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Procesul copil a eșuat"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nu are dependențe înglobate.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,7 +479,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:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -488,14 +488,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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -504,7 +504,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:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,30 +513,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Eșec la prelucrarea dependențelor de compilare"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectare la %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -625,16 +625,20 @@ msgstr ""
 "pentru mai multe informații și opțiuni.\n"
 "                       Acest APT are puterile unei Super Vaci.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -643,6 +647,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -672,8 +677,9 @@ msgstr "%s este deja la cea mai nouă versiune.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s este deja la cea mai nouă versiune.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Așteptat %s, dar n-a fost acolo"
@@ -869,7 +875,7 @@ msgstr ""
 "Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a "
 "expirat"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Eșec"
 
@@ -915,7 +921,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat"
 msgid "Unable to accept connection"
 msgstr "Nu s-a putut accepta conexiune"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problemă la calcularea dispersiei pentru fișierul"
 
@@ -1050,145 +1056,231 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Eroare la scrierea în fișierul"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Eroare la citirea de la server"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Eroare la scrierea în fișier"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Selecția a eșuat"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Timp de conectare expirat"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fișierului de rezultat"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "În așteptarea antetelor"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Linie de antet necorespunzătoare"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Acest server HTTP are un suport defect de intervale"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Format dată necunoscut"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Conectare eșuată"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Eroare internă"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Atins "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Luat:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ignorat "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Eroare"
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [ÃŽn lucru]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Schimbare de mediu: introduceți discul numit\n"
+" „%s�\n"
+"în unitatea „%s� și apăsați Enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Avertisment de autentificare înlocuit.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Unele pachete n-au putut fi autentificate"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Instalați aceste pachete fără verificare?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Eroare internă, Ordering nu s-a terminat"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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"
 
 #. 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
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Da, fă cum îți spun!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1199,19 +1291,19 @@ msgstr ""
 "Pentru a continua tastați fraza '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Renunțare."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Vreți să continuați?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Descărcarea unor fișiere a eșuat"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1219,19 +1311,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:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Nu pot corecta pachetele lipsă."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Abandonez instalarea."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1242,16 +1334,16 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
 # XXX: orice sugestie este bine-venită
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1270,15 +1362,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1292,7 +1384,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1304,7 +1396,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1324,7 +1416,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:628
+#: apt-private/private-install.cc:638
 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"
@@ -1337,68 +1429,68 @@ msgstr ""
 "pachete\n"
 "cerute n-au fost create încă sau au fost mutate din Incoming."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Următoarele extra pachete vor fi instalate:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Pachete sugerate:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Pachete recomandate:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s este deja la cea mai nouă versiune.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versiune selectată %s (%s) pentru %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versiune selectată %s (%s) pentru %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1407,136 +1499,116 @@ 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Instalat]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Instalat]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Instalat]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Instalat]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Următoarele pachete au dependențe neîndeplinite:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "dar %s este instalat"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "dar %s este pe cale de a fi instalat"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "dar nu este instalabil"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "dar este un pachet virtual"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "dar nu este instalat"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "dar nu este pe cale să fie instalat"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " sau"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Următoarele pachete au dependențe neîndeplinite:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Următoarele pachete NOI vor fi instalate:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Următoarele pachete vor fi ȘTERSE:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Următoarele pachete au fost reținute:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Următoarele pachete vor fi ÎNNOITE:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Următoarele pachete vor fi DE-GRADATE:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Următoarele pachete ținute vor fi schimbate:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (datorită %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1544,27 +1616,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu înnoite, %lu nou instalate, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalate, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu de-gradate, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu instalate sau șterse incomplet.\n"
@@ -1573,7 +1645,7 @@ msgstr "%lu instalate sau șterse incomplet.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1581,37 +1653,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1626,35 +1689,6 @@ msgstr[2] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avertisment de autentificare înlocuit.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Unele pachete n-au putut fi autentificate"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Instalați aceste pachete fără verificare?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1665,74 +1699,45 @@ msgstr "Eșec la redenumirea lui %s în %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Comanda de actualizare nu are argumente"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Terminat"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atins "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Luat:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ignorat "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Eroare"
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [ÃŽn lucru]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Schimbare de mediu: introduceți discul numit\n"
-" „%s�\n"
-"în unitatea „%s� și apăsați Enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nu s-a putut citi %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1809,37 +1814,437 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Se combină informațiile disponibile"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "S-a chemat DropNode pe un nod încă „legat�"
+#: 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"
 
-# XXX: nu-mi place, fie e hash, fie „element de dispersie�
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Eșec la localizarea elementului de dispersie!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nu se poate executa „stat� pe %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Eșec la alocarea redirectării"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nu s-a putut scrie în %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Eroare internă în „AddDiversion�"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Lista de extensii pentru pachet este prea lungă"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Eroare la prelucrarea directorului %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Lista de extensii pentru sursă este prea lungă"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Eroare la scrierea antetului în fișierul index"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Adăugare dublă de redirectare %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Eroare la prelucrarea conținutului %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Nu s-a potrivit nici o selecție"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Fișier „conf� duplicat %s/%s"
+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:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB este vechi, se încearcă înnoirea %s"
+
+#: ftparchive/cachedb.cc:94
+#, 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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nu s-a putut deschide fișierul DB %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Eșec la „stat� pentru %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Eșec la „readlink� pentru %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arhiva nu are înregistrare de control"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Arhiva nu are câmp de pachet"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nu are intrare de înlocuire\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s responsabil este %s nu %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nu are nici o intrare sursă de înlocuire\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s nu are nici intrare binară de înlocuire\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Eșec la redenumirea lui %s în %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1865,17 +2270,6 @@ msgstr "Pachetul încearcă să scrie în ținta redirectării %s/%s"
 msgid "The diversion path is too long"
 msgstr "Calea de redirectare este prea lungă"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1905,30 +2299,37 @@ msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s"
 msgid "Unable to stat %s"
 msgstr "Nu se poate executa „stat� pe %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "S-a chemat DropNode pe un nod încă „legat�"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Eșec la închiderea fișierului %s"
+# XXX: nu-mi place, fie e hash, fie „element de dispersie�
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Eșec la localizarea elementului de dispersie!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Eșec la alocarea redirectării"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Eroare internă în „AddDiversion�"
+
+#: apt-inst/filelist.cc:477
 #, 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�"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Eroare internă, nu pot localiza membrul %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Adăugare dublă de redirectare %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Fișier de control neanalizabil"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Fișier „conf� duplicat %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1977,203 +2378,52 @@ msgstr ""
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tip antet TAR %u necunoscut, membrul %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Sistemul de pachete '%s' nu este suportat"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "S-au scris %i înregistrări.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, 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 "This is not a valid DEB archive, missing '%s' member"
+msgstr "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s�"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Eroare internă, nu pot localiza membrul %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Fișier de control neanalizabil"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Nepotrivire la suma de căutare"
-
-#: 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/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/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Lista surselor nu poate fi citită."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Cache gol de pachet"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Cache-ul fișierului pachet este deteriorat"
-
-#: 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: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: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: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:321
-msgid "Depends"
-msgstr "Depinde"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Pre-depinde"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Sugerează"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Recomandă"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Este în conflict"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Înlocuiește"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "ÃŽnvechit"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Corupe"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "important"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "cerut"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standard"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opțional"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoda driver %s nu poate fi găsită."
+msgid "List directory %spartial is missing."
+msgstr "Directorul de liste %spartial lipsește."
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nu s-a lansat corect"
+msgid "Archives directory %spartial is missing."
+msgstr "Directorul de arhive %spartial lipsește."
 
-#: apt-pkg/acquire-worker.cc:455
-#, 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/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Nu pot încuia directorul cu lista"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "Tipul de fișier index '%s' nu este suportat"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Se construiește arborele de dependență"
-
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Eșec la deschiderea fișierului de stare %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Se descarcă fișierul %li din %li (%s rămas)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Eșec la scrierea fișierului temporar de stare %s"
+msgid "Retrieving file %li of %li"
+msgstr "Se descarcă fișierul %li din %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2193,37 +2443,37 @@ msgstr "Nepotrivire dimensiune"
 msgid "Invalid file format"
 msgstr "Operațiune invalidă %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2231,12 +2481,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2245,12 +2495,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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2258,169 +2508,112 @@ msgstr ""
 "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
 "pachetul %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache are un versioning system incompatibil"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Metoda driver %s nu poate fi găsită."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
+msgid "Is the package %s installed?"
+msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nu s-a lansat corect"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Mamăăă, ați depășit numărul de versiuni de care este capabil acest APT."
+"Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter."
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: 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 ""
-"Mamăăă, ați depășit numărul de descrieri de care este capabil acest APT."
+"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
-"Mamăăă, ați depășit numărul de dependențe de care este capabil acest APT."
+"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
+"cauzată de pachete ținute."
 
-#: 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/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/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/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/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/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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Colectare furnizori fișier"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Lista surselor nu poate fi citită."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release '%s' pentru '%s' n-a fost găsită"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Blocul vânzător %s nu conține amprentă"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Directorul de liste %spartial lipsește."
+msgid "Couldn't find task '%s'"
+msgstr "Nu s-a putut găsi sarcina %s"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Directorul de arhive %spartial lipsește."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nu pot găsi pachetul %s"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr "Se descarcă fișierul %li din %li (%s rămas)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nu pot găsi pachetul %s"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, 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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 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/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nu pot determina starea %s."
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, 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:444
+#: apt-pkg/cacheset.cc:647
 #, 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"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nu s-a putut deschide fișierul %s"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2503,54 +2696,87 @@ msgstr "Scriere noua listă sursă\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Intrările listei surselor pentru acest disc sunt:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Nu pot determina starea %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Se construiește arborele de dependență"
 
-#: 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: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 "Failed to open StateFile %s"
+msgstr "Eșec la deschiderea fișierului de stare %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Eșec la scrierea fișierului temporar de stare %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "S-au scris %i înregistrări.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Nepotrivire la suma de căutare"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2577,6 +2803,220 @@ msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Sistemul de pachete '%s' nu este suportat"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nu s-a putut deschide fișierul %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Cache gol de pachet"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Cache-ul fișierului pachet este deteriorat"
+
+#: 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: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: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: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:321
+msgid "Depends"
+msgstr "Depinde"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Pre-depinde"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Sugerează"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Recomandă"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Este în conflict"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Înlocuiește"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "ÃŽnvechit"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Corupe"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "important"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "cerut"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standard"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opțional"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Colectare furnizori fișier"
+
+#: 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/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/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 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2652,221 +3092,146 @@ msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
 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/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/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/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
-
-#: 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:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nu pot găsi pachetul %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nu pot găsi pachetul %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"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/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blocul vânzător %s nu conține amprentă"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "Nu pot determina starea punctului de montare %s"
 
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Eșec la „stat� pentru CD"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "Se instalează %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opțiunea linie de comandă '%c' [din %s] este necunoscută."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "Se configurează %s"
+msgid "Command line option %s is not understood"
+msgstr "Opțiunea linie de comandă %s nu este înțeleasă"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "Se șterge %s"
+msgid "Command line option %s is not boolean"
+msgstr "Opțiunea linie de comandă %s nu este booleană"
 
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Șters complet %s"
+#: 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/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
+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/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Se rulează declanșatorul post-instalare %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Opțiunea %s necesită un argument integru, nu '%s'"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Directorul „%s� lipsește."
-
-#: 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"
+msgid "Option '%s' is too long"
+msgstr "Opțiunea '%s' este prea lungă"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Se pregătește %s"
+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/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Se despachetează %s"
+msgid "Invalid operation %s"
+msgstr "Operațiune invalidă %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Se pregătește configurarea %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Abreviere de tip nerecunoscut: „%c�"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "Instalat %s"
+msgid "Opening configuration file %s"
+msgstr "Se deschide fișierul de configurare %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Se pregătește ștergerea lui %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "Șters %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Eroare de sintaxă %s:%u: etichetă greșită"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Se pregătește ștergerea completă a %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Șters complet %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, 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:110
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+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/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2981,54 +3346,11 @@ msgstr "Problemă la dezlegarea fișierului"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Terminat"
-
-#. 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ă"
+msgid "No keyring installed in %s."
+msgstr "Abandonez instalarea."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3082,530 +3404,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Eroare de sintaxă %s:%u: incluse de aici"
+msgid "%c%s... Error!"
+msgstr "%c%s... Eroare!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
+msgid "%c%s... Done"
+msgstr "%c%s... Terminat"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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ă"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Terminat"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Opțiunea %s necesită un argument"
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "%lih %limin %lis"
 msgstr ""
-"Opțiunea %s: Specificația configurării articolului trebuie să aibă o =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Opțiunea %s necesită un argument integru, nu '%s'"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opțiunea '%s' este prea lungă"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, 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)."
+msgid "Selection %s not found"
+msgstr "Selecția %s nu a fost găsită"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Lista de extensii pentru pachet este prea lungă"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Eroare la prelucrarea directorului %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista de extensii pentru sursă este prea lungă"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Eroare la scrierea antetului în fișierul index"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nu pot încuia directorul cu lista"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Eroare la prelucrarea conținutului %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Nu s-a potrivit nici o selecție"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, 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:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB este vechi, se încearcă înnoirea %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 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:99
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nu s-a putut deschide fișierul DB %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Eșec la „readlink� pentru %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arhiva nu are înregistrare de control"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Nu s-a putut obține un cursor"
+msgid "Installing %s"
+msgstr "Se instalează %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Nu s-a putut citi directorul %s\n"
+msgid "Configuring %s"
+msgstr "Se configurează %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, 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: "
+msgid "Removing %s"
+msgstr "Se șterge %s"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Erori la fișierul "
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Șters complet %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:99
 #, 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"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Failed to open %s"
-msgstr "Eșec la „open� pentru %s"
+msgid "Running post-installation trigger %s"
+msgstr "Se rulează declanșatorul post-instalare %s"
 
-#: ftparchive/writer.cc:278
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Dezlegare %s [%s]\n"
+msgid "Directory '%s' missing"
+msgstr "Directorul „%s� lipsește."
 
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Eșec la „readlink� pentru %s"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Nu s-a putut deschide fișierul %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Eșec la „unlink� pentru %s"
+msgid "Preparing %s"
+msgstr "Se pregătește %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Eșec la „link� între %s și %s"
+msgid "Unpacking %s"
+msgstr "Se despachetează %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arhiva nu are câmp de pachet"
+msgid "Preparing to configure %s"
+msgstr "Se pregătește configurarea %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nu are intrare de înlocuire\n"
+msgid "Installed %s"
+msgstr "Instalat %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s responsabil este %s nu %s\n"
+msgid "Preparing for removal of %s"
+msgstr "Se pregătește ștergerea lui %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nu are nici o intrare sursă de înlocuire\n"
+msgid "Removed %s"
+msgstr "Șters %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nu are nici intrare binară de înlocuire\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-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"
+msgid "Preparing to completely remove %s"
+msgstr "Se pregătește ștergerea completă a %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "Șters complet %s"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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"
+msgid "Can not write log (%s)"
+msgstr "Nu s-a putut scrie în %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Eșec la crearea FIȘIERULUI*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Eșec la „fork�"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Comprimare copil"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Eroare internă, eșec la crearea lui %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IE către subproces/fișier eșuat"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Eșec la citire în timpul calculului sumei MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problemă la desfacerea %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
 
 #~ 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 dc6359288..93d5163fb 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -24,7 +24,6 @@ msgstr ""
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: cmdline/apt-cache.cc:149
 #, c-format
@@ -105,74 +104,74 @@ msgstr "Полное учтённое про�тран�тво: "
 msgid "Package file %s is out of sync."
 msgstr "Спи�ок пакетов %s ра��инхронизирован."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Вы должны задать не менее одно шаблона пои�ка"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Эта команда у�тарела. И�пользуйте вме�то неё «apt-mark showauto»."
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "�е удало�ь найти пакет %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Спи�ки пакетов:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "К�ш ра��инхронизирован, невозможно обнаружить ��ылку на �пи�ок пакетов"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Зафик�ированные пакеты:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(не найдено)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  У�тановлен: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(от�ут�твует)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Фик�атор пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Таблица вер�ий:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -331,7 +330,7 @@ msgid "Couldn't find package %s"
 msgstr "�е удало�ь найти пакет %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s у�тановлен вручную.\n"
@@ -362,7 +361,7 @@ msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Укажите как минимум один пакет, и�ходный код которого необходимо получить"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "�евозможно найти пакет � и�ходным кодом дл� %s"
@@ -393,7 +392,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропу�каем уже �качанный файл «%s»\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "�е удало�ь определить количе�тво �вободного ме�та в %s"
@@ -426,7 +425,7 @@ msgstr "Получение и�ходного кода %s\n"
 msgid "Failed to fetch some archives."
 msgstr "�екоторые архивы не удало�ь получить."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Указан режим «только �качивание», и �качивание завершено"
 
@@ -435,32 +434,32 @@ msgstr "Указан режим «только �качивание», и �ка
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Пропу�кает�� ра�паковка уже ра�пакованного и�ходного кода в %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда ра�паковки «%s» завершила�ь неудачно.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверьте, у�тановлен ли пакет «dpkg-dev».\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда �борки «%s» завершила�ь неудачно.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Порождённый проце�� завершил�� неудачно"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Дл� проверки зави�имо�тей дл� �борки необходимо указать как минимум один "
 "пакет"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -469,17 +468,17 @@ msgstr ""
 "У %s от�ут�твует информаци� об архитектуре. Дл� её на�тройки �мотрите apt."
 "conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "�евозможно получить информацию о зави�имо�т�х дл� �борки %s"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не имеет зави�имо�тей дл� �борки.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -488,7 +487,7 @@ msgstr ""
 "Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как %s не "
 "разрешён дл� пакетов «%s»"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -497,14 +496,14 @@ msgstr ""
 "Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как пакет %s не "
 "найден"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "�е удало�ь удовлетворить зави�имо�ть типа %s дл� пакета %s: У�тановленный "
 "пакет %s новее, чем надо"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -513,7 +512,7 @@ msgstr ""
 "Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как вер�и�-"
 "кандидат пакета %s не может удовлетворить требовани�м по вер�ии"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -522,30 +521,30 @@ msgstr ""
 "Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как пакет %s не "
 "имеет вер�ии-кандидата"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "�евозможно удовлетворить зави�имо�ть типа %s дл� пакета %s: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зави�имо�ти дл� �борки %s не могут быть удовлетворены."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Обработка зави�имо�тей дл� �борки завершила�ь неудачно"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog дл� %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -637,17 +636,21 @@ msgstr ""
 "�одержит�� подробна� информаци� и опи�ание параметров.\n"
 "                       В APT е�ть коровь� СУПЕРСИЛ�.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 "Укажите как минимум один пакет, и�ходный код которого необходимо получить"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -656,6 +659,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -685,8 +689,9 @@ msgstr "%s уже помечен как зафик�ированный.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s уже помечен как не зафик�ированный.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ожидало�ь завершение проце��а %s, но он не был запущен"
@@ -907,7 +912,7 @@ msgstr ""
 "�е удало�ь при�оединить�� к �окету данных, врем� на у�тановление �оединени� "
 "и�текло"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "�еудачно"
 
@@ -953,7 +958,7 @@ msgstr "Врем� у�тановлени� �оединени� дл� �оке
 msgid "Unable to accept connection"
 msgstr "�евозможно прин�ть �оединение"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Проблема при хешировании файла"
 
@@ -1085,113 +1090,205 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Пу�тые файлы не могут быть допу�тимыми архивами"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Ошибка запи�и в файл"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Ошибка чтени�, удалённый �ервер прервал �оединение"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Ошибка чтени� � �ервера"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Ошибка запи�и в файл"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Ошибка в select"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Врем� ожидани� дл� �оединени� и�текло"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Ошибка запи�и в выходной файл"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Ожидание заголовков"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "�еверный заголовок"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-�ервер по�лал неверный заголовок"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http �ервер по�лал неверный заголовок Content-Length"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-�ервер по�лал неверный заголовок Content-Range"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Этот HTTP-�ервер не поддерживает �качивание фрагментов файлов"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "�еизве�тный формат данных"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "�еверный заголовок данных"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Внутренн�� ошибка"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "В к�ше "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Получено:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Игн "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Ош  "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Обработка]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Смена но�ител�: в�тавьте ди�к � меткой\n"
+" «%s»\n"
+"в у�трой�тво «%s» и нажмите ввод\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "В�ИМ��ИЕ: Следующие пакеты невозможно аутентифицировать!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Предупреждение об аутентификации не прин�то в внимание.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "�екоторые пакеты невозможно аутентифицировать"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "У�тановить �ти пакеты без проверки?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Суще�твуют проблемы, а параметр -y указан без --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "�е удало�ь получить %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Внутренн�� ошибка, InstallPackages была вызвана � неработо�по�обными "
 "пакетами!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Пакеты необходимо удалить, но удаление запрещено."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутренн�� ошибка, Ordering не завершила�ь"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1200,23 +1297,19 @@ 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
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "По�ле данной операции, объём зан�того ди�кового про�тран�тва уменьшит�� на "
 "%sB.\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "�едо�таточно �вободного ме�та в %s."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Суще�твуют проблемы, а параметр -y указан без --force-yes"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Запрошено выполнение только тривиальных операций, но �то не тривиальна� "
@@ -1224,11 +1317,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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Да, делать, как � �кажу!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1239,19 +1332,19 @@ msgstr ""
 "Чтобы продолжить, введите фразу: «%s»\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "�варийное завершение."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Хотите продолжить?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "�екоторые файлы �качать не удало�ь"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1259,19 +1352,19 @@ msgstr ""
 "�евозможно получить некоторые архивы, веро�тно надо запу�тить apt-get update "
 "или попытать�� повторить запу�к � ключом --fix-missing"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing и �мена но�ител� в данный момент не поддерживают��"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "�евозможно и�править �итуацию � пропущенными пакетами."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "�варийное завершение у�тановки."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1288,15 +1381,15 @@ msgstr[2] ""
 "Следующие пакеты и�чез из �и�темы, так как в�е их файлы\n"
 "теперь берут�� из других пакетов:"
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Замечание: �то �делано автоматиче�ки и �пециально программой dpkg."
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "�е предполагало�ь удал�ть stuff, невозможно запу�тить AutoRemover"
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1314,15 +1407,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "Следующа� информаци�, возможно, поможет вам:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутренн�� ошибка, AutoRemover в�ё поломал"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1334,7 +1427,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Следующие пакеты у�танавливали�ь автоматиче�ки и больше не требуют��:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1343,7 +1436,7 @@ msgstr[0] "%lu пакет был у�тановлен автоматиче�ки
 msgstr[1] "%lu пакета было у�тановлено автоматиче�ки и больше не требует��.\n"
 msgstr[2] "%lu пакетов было у�тановлены автоматиче�ки и больше не требуют��.\n"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Дл� его удалени� и�пользуйте «apt-get autoremove»."
@@ -1364,7 +1457,7 @@ msgstr ""
 "�еудовлетворённые зави�имо�ти. Попытайте�ь выполнить «apt-get -f install», "
 "не указыва� имени пакета, (или найдите другое решение)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1375,71 +1468,71 @@ msgstr ""
 "или же и�пользуете не�табильную вер�ию ди�трибутива, где запрошенные вами\n"
 "пакеты ещё не �озданы или были удалены из Incoming."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Сломанные пакеты"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Будут у�тановлены �ледующие дополнительные пакеты:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Предлагаемые пакеты:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Рекомендуемые пакеты:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Пропу�кает�� %s — пакет уже у�тановлен и нет команды upgrade.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Пропу�кает�� %s — пакет не у�тановлен, а запрошено только обновление.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Переу�тановка %s невозможна, он не �качивает��.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Уже у�тановлена �ама� нова� вер�и� %s.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Выбрана вер�и� «%s» (%s) дл� «%s»\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Выбрана вер�и� «%s» (%s) дл� «%s» из-за «%s»\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Пакет «%s» не у�тановлен, по�тому не может быть удалён. Возможно имел�� в "
 "виду «%s»?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакет «%s» не у�тановлен, по�тому не может быть удалён\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1448,139 +1541,121 @@ 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."
+#: 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-get -"
-"f install»."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "�еудовлетворённые зави�имо�ти. Попытайте�ь и�пользовать -f."
+"З�МЕЧ��ИЕ: Производить только имитаци� работы!\n"
+"      Дл� реальной работы apt-get требуют�� права �уперпользовател�.\n"
+"      Учтите, что блокировка не и�пользует��,\n"
+"      по�тому нет полного �оответ�тви� � текущей реальной �итуацией!"
 
 #: apt-private/private-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [У�тановлен]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [У�тановлен]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [У�тановлен]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [У�тановлен]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакеты, имеющие неудовлетворённые зави�имо�ти:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "но %s уже у�тановлен"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "но %s будет у�тановлен"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "но он не может быть у�тановлен"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "но �то виртуальный пакет"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "но он не у�тановлен"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "но он не будет у�тановлен"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " или"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакеты, имеющие неудовлетворённые зави�имо�ти:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "�ОВЫЕ пакеты, которые будут у�тановлены:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Пакеты, которые будут УД�ЛЕ�Ы:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Пакеты, которые будут о�тавлены в неизменном виде:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Пакеты, которые будут обновлены:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Пакеты, будут заменены на более СТ�РЫЕ вер�ии:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr ""
 "Пакеты, которые должны были бы о�тать�� без изменений, но будут заменены:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (в�лед�твие %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1588,27 +1663,27 @@ msgstr ""
 "В�ИМ��ИЕ: Эти �уще�твенно важные пакеты будут удалены.\n"
 "�Е ДЕЛ�ЙТЕ �того, е�ли вы �Е пред�тавл�ете �ебе в�е возможные по�лед�тви�!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "обновлено %lu, у�тановлено %lu новых пакетов, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "переу�тановлено %lu переу�тановлено, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu пакетов заменены на �тарые вер�ии, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "дл� удалени� отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "не у�тановлено до конца или удалено %lu пакетов.\n"
@@ -1617,7 +1692,7 @@ msgstr "не у�тановлено до конца или удалено %lu п
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[Д/н]"
 
@@ -1625,37 +1700,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "д"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "н"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1670,39 +1736,6 @@ msgstr[2] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "В�ИМ��ИЕ: Следующие пакеты невозможно аутентифицировать!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Предупреждение об аутентификации не прин�то в внимание.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "�екоторые пакеты невозможно аутентифицировать"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "У�тановить �ти пакеты без проверки?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "�е удало�ь получить %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1713,74 +1746,45 @@ msgstr "�е удало�ь переименовать %s в %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Команде update не нужны аргументы"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Готово"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "В к�ше "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Получено:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Игн "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Ош  "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Обработка]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Смена но�ител�: в�тавьте ди�к � меткой\n"
-" «%s»\n"
-"в у�трой�тво «%s» и нажмите ввод\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "�евозможно прочитать %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1856,36 +1860,434 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Сли�ние до�тупной информации"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode вызван дл� узла, который ещё и�пользует��"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "�е удало�ь найти �лемент хеша!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "�евозможно получить атрибуты %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "�е удало�ь �оздать diversion"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "�евозможно запи�ать в %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Внутренн�� ошибка в AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "�евозможно определить вер�ию debconf. Он у�тановлен?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Спи�ок ра�ширений, допу�тимых дл� пакетов, �лишком длинен"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Попытка изменени� diversion, %s -> %s и %s/%s"
+msgid "Error processing directory %s"
+msgstr "Ошибка обработки каталога %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Спи�ок ра�ширений и�точников �лишком длинен"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr ""
+"Ошибка запи�и заголовка в полный перечень �одержимого пакетов (Contents)"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Двойное добавление diversion %s -> %s"
+msgid "Error processing contents %s"
+msgstr "ошибка обработки полного перечн� �одержимого пакетов (Contents) %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Совпадений не обнаружено"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Повторно указан файл на�тройки %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "В группе пакетов «%s» от�ут�твуют некоторые файлы"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД была повреждена, файл переименован в %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB у�тарела, попытка обновить %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "�е удало�ь открыть DB файл %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "�е удало�ь получить атрибуты %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "�е удало�ь проче�ть ��ылку %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "В архиве нет пол� control"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "В архиве нет пол� package"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  �ет запи�и о переназначении (override) дл� %s\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  пакет %s �опровождает %s, а не %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  �ет запи�и source override дл� %s\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  �ет запи�и binary override дл� %s\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "�е удало�ь переименовать %s в %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1911,17 +2313,6 @@ msgstr "Пакет пытает�� пи�ать в diversion %s/%s"
 msgid "The diversion path is too long"
 msgstr "Путь diversion �лишком длинен"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1950,30 +2341,36 @@ msgstr "Файл %s/%s перепи�ывает файл в пакете %s"
 msgid "Unable to stat %s"
 msgstr "�евозможно получить атрибуты %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode вызван дл� узла, который ещё и�пользует��"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "�е удало�ь закрыть файл %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "�е удало�ь найти �лемент хеша!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "�е удало�ь �оздать diversion"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Внутренн�� ошибка в AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Это неправильный DEB-архив — от�ут�твует �о�тавна� ча�ть «%s»"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Попытка изменени� diversion, %s -> %s и %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Внутренн�� ошибка, не удало�ь найти �о�тавную ча�ть %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Двойное добавление diversion %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "�е удало�ь проче�ть �одержимое control-файла"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Повторно указан файл на�тройки %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -2021,199 +2418,52 @@ msgstr "�еправильна� контрольна� �умма Tar, архи
 msgid "Unknown TAR header type %u, member %s"
 msgstr "�еизве�тный заголовок в архиве TAR. Тип %u, �лемент %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Запу�кает�� dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Си�тема пакетировани� «%s» не поддерживает��"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "�евозможно определить подход�щий тип �и�темы пакетировани�"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Сохранено %i запи�ей.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Сохранено %i запи�ей � %i от�ут�твующими файлами.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Сохранено %i запи�ей � %i не�овпадающими файлами\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Это неправильный DEB-архив — от�ут�твует �о�тавна� ча�ть «%s»"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"Сохранено %i запи�ей � %i от�ут�твующими файлами и � %i не�овпадающими "
-"файлами\n"
+msgid "Internal error, could not locate member %s"
+msgstr "Внутренн�� ошибка, не удало�ь найти �о�тавную ча�ть %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "�е удало�ь найти аутентификационную запи�ь дл�: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "�е удало�ь проче�ть �одержимое control-файла"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "�е �овпадает хеш �умма дл�: %s"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Спи�ки пакетов или файл �о�то�ни� не могут быть открыты или прочитаны."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Вы можете запу�тить «apt-get update» дл� и�правлени� �тих ошибок"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "�е читает�� перечень и�точников."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "К�ш пакетов пу�т"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "К�ш пакетов повреждён"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "�е поддерживаема� вер�и� к�ша пакетов"
-
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "К�ш пакетов повреждён, он �лишком мал"
+msgid "List directory %spartial is missing."
+msgstr "Каталог �пи�ка %spartial от�ут�твует."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Эта вер�и� APT не поддерживает �и�тему вер�ий «%s»"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "К�ш пакетов был �обран дл� другой архитектуры"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Зави�ит"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "ПредЗави�ит"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Предлагает"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Рекомендует"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Конфликтует"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Замен�ет"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Замещает"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Ломает"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Улучшает"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "важный"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "необходимый"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "�тандартный"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "необ�зательный"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "дополнительный"
+msgid "Archives directory %spartial is missing."
+msgstr "�рхивный каталог %spartial от�ут�твует."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер дл� метода %s не найден."
+msgid "Unable to lock directory %s"
+msgstr "�евозможно заблокировать каталог %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверьте, у�тановлен ли пакет «dpkg-dev».\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s запу�тил�� не корректно"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "В�тавьте ди�к � меткой «%s» в у�трой�тво «%s» и нажмите ввод."
-
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "�е поддерживает�� индек�ный файл типа «%s»"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "�е удало�ь открыть StateFile %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Скачивает�� файл %li из %li (о�тало�ь %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "�е удало�ь запи�ать временный StateFile %s"
+msgid "Retrieving file %li of %li"
+msgstr "Скачивает�� файл %li из %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2233,7 +2483,7 @@ msgstr "�е �овпадает размер"
 msgid "Invalid file format"
 msgstr "�еверна� операци� %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2242,16 +2492,16 @@ msgstr ""
 "�евозможно найти ожидаемый �лемент «%s» в файле Release (некорректна� запи�ь "
 "в sources.list или файл)"
 
-#: apt-pkg/acquire-item.cc:1597
+#: apt-pkg/acquire-item.cc:1589
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "�евозможно найти хеш-�умму «%s» в файле Release"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "�едо�тупен открытый ключ дл� �ледующих ID ключей:\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2260,12 +2510,12 @@ msgstr ""
 "Файл Release дл� %s про�рочен (недо�товерный начина� � %s). Обновление �того "
 "репозитори� производить�� не будет."
 
-#: apt-pkg/acquire-item.cc:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфликт ра�про�транени�: %s (ожидал�� %s, но получен %s)"
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2275,12 +2525,12 @@ msgstr ""
 "и�пользованы предыдущие индек�ные файлы. Ошибка GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Ошибка GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2289,184 +2539,128 @@ msgstr ""
 "�е удало�ь обнаружить файл пакета %s. Это может означать, что вам придёт�� "
 "вручную и�править �тот пакет (возможно, пропущен arch)"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "�евозможно найти и�точник дл� загрузки «%2$s» вер�ии «%1$s»"
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "�екорректный перечень пакетов. �ет пол� Filename: дл� пакета %s."
 
-#: 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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Произошла ошибка во врем� обработки %s (%s%d)"
-
-#: 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:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Превышено допу�тимое количе�тво вер�ий, которое �по�обен обработать APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Превышено допу�тимое количе�тво опи�аний, которое �по�обен обработать APT."
+msgid "The method driver %s could not be found."
+msgstr "Драйвер дл� метода %s не найден."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Превышено допу�тимое количе�тво зави�имо�тей, которое �по�обен обработать "
-"APT."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверьте, у�тановлен ли пакет «dpkg-dev».\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Во врем� обработки файла зави�имо�тей не найден пакет %s %s"
+msgid "Method %s did not start correctly"
+msgstr "Метод %s запу�тил�� не корректно"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "�е удало�ь получить атрибуты �пи�ка пакетов и�ходного кода %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "В�тавьте ди�к � меткой «%s» в у�трой�тво «%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/algorithms.cc:265
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Пакет %s нуждает�� в переу�тановке, но найти архив дл� него не удало�ь."
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Сбор информации о Provides"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Ошибка, pkgProblemResolver::Resolve �генерировал повреждённые пакеты. Это "
+"может быть вызвано отложенными (held) пакетами."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "�евозможно запи�ать в %s"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "�евозможно и�править ошибки, у ва� отложены (held) битые пакеты."
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Ошибка ввода/вывода при попытке �охранить к�ш и�точников"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Спи�ки пакетов или файл �о�то�ни� не могут быть открыты или прочитаны."
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Блок по�тавщика %s не �одержит отпечатка (fingerprint)"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Вы можете запу�тить «apt-get update» дл� и�правлени� �тих ошибок"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Каталог �пи�ка %spartial от�ут�твует."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "�е читает�� перечень и�точников."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "�рхивный каталог %spartial от�ут�твует."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Выпу�к «%s» дл� «%s» не найден"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "�евозможно заблокировать каталог %s"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Вер�и� «%s» дл� «%s» не найдена"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Скачивает�� файл %li из %li (о�тало�ь %s)"
+msgid "Couldn't find task '%s'"
+msgstr "�е удало�ь найти задачу «%s»"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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 ""
-"�екоторые индек�ные файлы не �качали�ь. Они были проигнорированы или вме�то "
-"них были и�пользованы �тарые вер�ии."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "�е удало�ь найти пакет по регул�рному выражению «%s»"
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Вы должны заполнить sources.list, поме�тив туда URI и�точников пакетов"
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "�е удало�ь найти пакет по регул�рному выражению «%s»"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "�евозможно получить атрибуты %s."
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"�е удало�ь выбрать вер�ии из пакета «%s», так как он полно�тью виртуальный"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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 "Дл� фик�ации не указан приоритет (или указан нулевой)"
+"�е удало�ь выбрать ни у�тановленную, ни вер�ию кандидата из пакета «%s», так "
+"как в нём нет ни той, ни другой"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"�е удало�ь выполнить оперативную на�тройку «%s». Подробней, �мотрите в man 5 "
-"apt.conf о APT::Immediate-Configure. (%d)"
+"�е удало�ь выбрать �амую новую вер�ию из пакета «%s», так как он полно�тью "
+"виртуальный"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "�е удало�ь на�троить «%s»."
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"�е удало�ь выбрать �амую вер�ию кандидата из пакета %s, так как у него нет "
+"кандидатов"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"В�лед�твие возникновени� цикличе�ких зави�имо�тей типа Конфликтует/"
-"ПредЗави�ит, дл� продолжени� у�тановки необходимо временно удалить "
-"�уще�твенно важный пакет %s. Это может приве�ти к фатальным по�лед�тви�м. "
-"Е�ли вы дей�твительно хотите продолжить, у�тановите параметр APT::Force-"
-"LoopBreak."
+"�е удало�ь выбрать у�тановленную вер�ию из пакета %s, так как он не "
+"у�тановлен"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2550,54 +2744,88 @@ msgstr "Запи�ь нового �пи�ка и�точников\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Запи�и в �пи�ке и�точников дл� �того ди�ка:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Пакет %s нуждает�� в переу�тановке, но найти архив дл� него не удало�ь."
+msgid "Unable to stat %s."
+msgstr "�евозможно получить атрибуты %s."
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Ошибка, pkgProblemResolver::Resolve �генерировал повреждённые пакеты. Это "
-"может быть вызвано отложенными (held) пакетами."
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "По�троение дерева зави�имо�тей"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "�евозможно и�править ошибки, у ва� отложены (held) битые пакеты."
+#: 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 "Failed to open StateFile %s"
+msgstr "�е удало�ь открыть StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "�е удало�ь запи�ать временный StateFile %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Отправка �ценари� решателю"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Отправка запро�а решателю"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Подготовка к приёму решени�"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr "Внешний решатель завершил�� � ошибкой не передав �ообщени� об ошибке"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Запу�тить внешний решатель"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "�евозможно разобрать �одержимое пакета %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Сохранено %i запи�ей.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "�евозможно разобрать �одержимое пакета %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Сохранено %i запи�ей � %i от�ут�твующими файлами.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Сохранено %i запи�ей � %i не�овпадающими файлами\n"
+
+#: 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 ""
+"Сохранено %i запи�ей � %i от�ут�твующими файлами и � %i не�овпадающими "
+"файлами\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "�е удало�ь найти аутентификационную запи�ь дл�: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "�е �овпадает хеш �умма дл�: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2624,6 +2852,224 @@ msgstr "�еправильный �лемент «Valid-Until» в файле Re
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "�еправильный �лемент «Date» в файле Release %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Си�тема пакетировани� «%s» не поддерживает��"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "�евозможно определить подход�щий тип �и�темы пакетировани�"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Запу�кает�� dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "�е удало�ь на�троить «%s»."
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "К�ш пакетов пу�т"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "К�ш пакетов повреждён"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "�е поддерживаема� вер�и� к�ша пакетов"
+
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr "К�ш пакетов повреждён, он �лишком мал"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Эта вер�и� APT не поддерживает �и�тему вер�ий «%s»"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "К�ш пакетов был �обран дл� другой архитектуры"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Зави�ит"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "ПредЗави�ит"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Предлагает"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Рекомендует"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Конфликтует"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Замен�ет"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Замещает"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Ломает"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Улучшает"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "важный"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "необходимый"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "�тандартный"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "необ�зательный"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "дополнительный"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Превышено допу�тимое количе�тво имён пакетов, которое �по�обен обработать "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Превышено допу�тимое количе�тво вер�ий, которое �по�обен обработать APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Превышено допу�тимое количе�тво опи�аний, которое �по�обен обработать APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Превышено допу�тимое количе�тво зави�имо�тей, которое �по�обен обработать "
+"APT."
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "�е удало�ь получить атрибуты �пи�ка пакетов и�ходного кода %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 "Сбор информации о Provides"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Ошибка ввода/вывода при попытке �охранить к�ш и�точников"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "�е поддерживает�� индек�ный файл типа «%s»"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2703,247 +3149,146 @@ msgstr "�еизве�тный тип «%s» в �троке %u в �пи�ке
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "�еизве�тный тип «%s» в �троке %u в �пи�ке и�точников %s"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Выпу�к «%s» дл� «%s» не найден"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Вер�и� «%s» дл� «%s» не найдена"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "�е удало�ь найти задачу «%s»"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Вы должны заполнить sources.list, поме�тив туда URI и�точников пакетов"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "�е удало�ь найти пакет по регул�рному выражению «%s»"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "�е удало�ь найти пакет по регул�рному выражению «%s»"
+msgid "Unable to parse package file %s (1)"
+msgstr "�евозможно разобрать �одержимое пакета %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"�е удало�ь выбрать вер�ии из пакета «%s», так как он полно�тью виртуальный"
+msgid "Unable to parse package file %s (2)"
+msgstr "�евозможно разобрать �одержимое пакета %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"�е удало�ь выбрать ни у�тановленную, ни вер�ию кандидата из пакета «%s», так "
-"как в нём нет ни той, ни другой"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"�е удало�ь выбрать �амую новую вер�ию из пакета «%s», так как он полно�тью "
-"виртуальный"
+"�екоторые индек�ные файлы не �качали�ь. Они были проигнорированы или вме�то "
+"них были и�пользованы �тарые вер�ии."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"�е удало�ь выбрать �амую вер�ию кандидата из пакета %s, так как у него нет "
-"кандидатов"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Блок по�тавщика %s не �одержит отпечатка (fingerprint)"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"�е удало�ь выбрать у�тановленную вер�ию из пакета %s, так как он не "
-"у�тановлен"
+msgid "Unable to stat the mount point %s"
+msgstr "�евозможно прочитать атрибуты точки монтировани� %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "У�танавливает�� %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "�евозможно получить атрибуты cdrom"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "�а�траивает�� %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "�еизве�тный параметр командной �троки «%c» [из %s]."
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Удал�ет�� %s"
+msgid "Command line option %s is not understood"
+msgstr "�е ра�познанный параметр командной �троки %s"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "Выполн�ет�� полное удаление %s"
+msgid "Command line option %s is not boolean"
+msgstr "Параметр командной �троки %s — не логиче�кий переключатель \"да/нет\""
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Уведомление об и�чезновении %s"
+msgid "Option %s requires an argument."
+msgstr "Дл� параметра %s требует�� аргумент."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Выполн�ет�� по�леу�тановочный триггер %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Значение параметра %s должно иметь вид =<val>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "От�ут�твует каталог «%s»"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Дл� параметра %s требует�� аргумент в виде целого чи�ла, а не «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "�е удало�ь открыть файл «%s»"
+msgid "Option '%s' is too long"
+msgstr "Параметр «%s» �лишком длинный"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Подготавливает�� %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Смы�л %s не ��ен, и�пользуйте true или false."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Ра�паковывает�� %s"
+msgid "Invalid operation %s"
+msgstr "�еверна� операци� %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Подготавливает�� дл� на�тройки %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "�еизве�тна� аббревиатура типа: «%c»"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "У�тановлен %s"
+msgid "Opening configuration file %s"
+msgstr "Открытие файла на�тройки %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Подготавливает�� дл� удалени� %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Синтак�иче�ка� ошибка %s:%u: в начале блока нет имени."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "Удалён %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Синтак�иче�ка� ошибка %s:%u: и�кажённый тег"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Подготовка к полному удалению %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Синтак�иче�ка� ошибка %s:%u: лишние �имволы по�ле значени�"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s полно�тью удалён"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "Дей�твие прервано до его завершени�"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "проблемы � зави�имо�т�ми — о�тавл�ем нена�троенным"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Отчёты apport не запи�аны, так как получено �ообщение об ошибке о нехватке "
-"ме�та на ди�ке"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Отчёты apport не запи�аны, так как получено �ообщение об ошибке о нехватке "
-"пам�ти"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Отчёты apport не запи�аны, так как получено �ообщение об ошибке о нехватке "
-"ме�та на ди�ке"
+"Синтак�иче�ка� ошибка %s:%u: директивы могут задавать�� только на верхнем "
+"уровне"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Отчёты apport не запи�аны, так как получено �ообщение об ошибке об ошибке "
-"ввода-выводы dpkg"
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Синтак�иче�ка� ошибка %s:%u: �лишком много вложенных include"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"�е удало�ь выполнить блокировку управл�ющего каталога (%s); он уже "
-"и�пользует�� другим проце��ом?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Синтак�иче�ка� ошибка %s:%u вызвана include из �того ме�та"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"�е удало�ь выполнить блокировку управл�ющего каталога (%s); у ва� е�ть права "
-"�уперпользовател�?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Синтак�иче�ка� ошибка %s:%u: не поддерживаема� директива «%s»"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"Работа dpkg прервана, вы должны вручную запу�тить «%s» дл� у�транени� "
-"проблемы. "
+"Синтак�иче�ка� ошибка %s:%u: дл� директивы clear требует�� третий параметр в "
+"каче�тве аргумента"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "�е заблокирован"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Синтак�иче�ка� ошибка %s:%u: лишние �имволы в конце файла"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3066,54 +3411,11 @@ msgstr "Проблема при удалении файла %s"
 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%%"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "�е найдено: %s"
+msgid "No keyring installed in %s."
+msgstr "Св�зка ключей в %s не у�тановлена."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3170,528 +3472,236 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "No keyring installed in %s."
-msgstr "Св�зка ключей в %s не у�тановлена."
+msgid "%c%s... Error!"
+msgstr "%c%s… Ошибка!"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "�еизве�тный параметр командной �троки «%c» [из %s]."
+msgid "%c%s... Done"
+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/progress.cc:181
+msgid "..."
+msgstr "…"
 
-#: apt-pkg/contrib/cmndline.cc:168
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Параметр командной �троки %s — не логиче�кий переключатель \"да/нет\""
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Дл� параметра %s требует�� аргумент."
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liч %liмин %li�"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Значение параметра %s должно иметь вид =<val>."
+msgid "%lih %limin %lis"
+msgstr "%liч %liмин %li�"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Дл� параметра %s требует�� аргумент в виде целого чи�ла, а не «%s»"
+msgid "%limin %lis"
+msgstr "%liмин %li�"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Параметр «%s» �лишком длинный"
+msgid "%lis"
+msgstr "%li�"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Смы�л %s не ��ен, и�пользуйте true или false."
+msgid "Selection %s not found"
+msgstr "�е найдено: %s"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Спи�ок ра�ширений, допу�тимых дл� пакетов, �лишком длинен"
+"�е удало�ь выполнить блокировку управл�ющего каталога (%s); он уже "
+"и�пользует�� другим проце��ом?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Ошибка обработки каталога %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Спи�ок ра�ширений и�точников �лишком длинен"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
+msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
-"Ошибка запи�и заголовка в полный перечень �одержимого пакетов (Contents)"
+"�е удало�ь выполнить блокировку управл�ющего каталога (%s); у ва� е�ть права "
+"�уперпользовател�?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "ошибка обработки полного перечн� �одержимого пакетов (Contents) %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Совпадений не обнаружено"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "В группе пакетов «%s» от�ут�твуют некоторые файлы"
+"Работа dpkg прервана, вы должны вручную запу�тить «%s» дл� у�транени� "
+"проблемы. "
 
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД была повреждена, файл переименован в %s.old"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "�е заблокирован"
 
-#: ftparchive/cachedb.cc:83
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB у�тарела, попытка обновить %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"�екорректный формат базы данных (DB). Е�ли вы обновл�ли вер�ию apt, удалите "
-"и �оздайте базу данных заново."
+msgid "Installing %s"
+msgstr "У�танавливает�� %s"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "�е удало�ь открыть DB файл %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "�е удало�ь проче�ть ��ылку %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "В архиве нет пол� control"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "�евозможно получить кур�ор"
+msgid "Configuring %s"
+msgstr "�а�траивает�� %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: �е удало�ь прочитать каталог %s\n"
+msgid "Removing %s"
+msgstr "Удал�ет�� %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:98
 #, 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: Ошибки отно��т�� к файлу "
+msgid "Completely removing %s"
+msgstr "Выполн�ет�� полное удаление %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "�е удало�ь про�ледовать по ��ылке %s"
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "�е удало�ь �овершить обход дерева"
+msgid "Noting disappearance of %s"
+msgstr "Уведомление об и�чезновении %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Failed to open %s"
-msgstr "�е удало�ь открыть %s"
+msgid "Running post-installation trigger %s"
+msgstr "Выполн�ет�� по�леу�тановочный триггер %s"
 
-#: ftparchive/writer.cc:278
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "DeLink %s [%s]\n"
+msgid "Directory '%s' missing"
+msgstr "От�ут�твует каталог «%s»"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "�е удало�ь проче�ть ��ылку %s"
+msgid "Could not open file '%s'"
+msgstr "�е удало�ь открыть файл «%s»"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "�е удало�ь удалить %s"
+msgid "Preparing %s"
+msgstr "Подготавливает�� %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** �е удало�ь �оздать ��ылку %s на %s"
+msgid "Unpacking %s"
+msgstr "Ра�паковывает�� %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Превышен лимит в %sB в DeLink.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "В архиве нет пол� package"
+msgid "Preparing to configure %s"
+msgstr "Подготавливает�� дл� на�тройки %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  �ет запи�и о переназначении (override) дл� %s\n"
+msgid "Installed %s"
+msgstr "У�тановлен %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  пакет %s �опровождает %s, а не %s\n"
+msgid "Preparing for removal of %s"
+msgstr "Подготавливает�� дл� удалени� %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  �ет запи�и source override дл� %s\n"
+msgid "Removed %s"
+msgstr "Удалён %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  �ет запи�и binary override дл� %s\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc — не удало�ь выделить пам�ть"
+msgid "Preparing to completely remove %s"
+msgstr "Подготовка к полному удалению %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unable to open %s"
-msgstr "�е удало�ь открыть %s"
+msgid "Completely removed %s"
+msgstr "%s полно�тью удалён"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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»"
+msgid "Can not write log (%s)"
+msgstr "�евозможно запи�ать в %s"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
 msgstr ""
-"Дл� получени� �жатого вывода %s необходимо включить и�пользовани� �жати�"
-
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "�е удало�ь �оздать FILE*"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "�е удало�ь запу�тить порождённый проце��"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Проце��-потомок, производ�щий �жатие"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "Дей�твие прервано до его завершени�"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Внутренн�� ошибка, не удало�ь �оздать %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Отчёты apport не запи�аны, так до�тигнут MaxReports"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Ошибка ввода/вывода в подпроце��/файл"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "проблемы � зави�имо�т�ми — о�тавл�ем нена�троенным"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Ошибка чтени� во врем� вычи�лени� MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Отчёты apport не запи�аны, так как �ообщение об ошибке указывает на "
+"повторную ошибку от предыдущего отказа."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "�е удало�ь удалить %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Отчёты apport не запи�аны, так как получено �ообщение об ошибке о нехватке "
+"ме�та на ди�ке"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Отчёты apport не запи�аны, так как получено �ообщение об ошибке о нехватке "
+"пам�ти"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Запи�ь о неизве�тном пакете!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Отчёты apport не запи�аны, так как получено �ообщение об ошибке о нехватке "
+"ме�та на ди�ке"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Отчёты apport не запи�аны, так как получено �ообщение об ошибке об ошибке "
+"ввода-выводы dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Внутренн�� ошибка, AllUpgrade в�ё поломал"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s не �вл�ет�� правильным DEB-пакетом."
diff --git a/po/sk.po b/po/sk.po
index 205c11d75..acfd4cf5b 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -99,76 +99,76 @@ msgstr "Celkom priradeného miesta: "
 msgid "Package file %s is out of sync."
 msgstr "Súbor balíkov %s je neaktuálny."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Musíte zadať aspoň jeden vyhľadávací vzor"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 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:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Súbory balíka:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Pripevnené balíky:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(nenájdené)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Nainštalovaná verzia: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(žiadna)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Pripevnený balík:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Tabuľka verzií:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -327,7 +327,7 @@ msgid "Couldn't find package %s"
 msgstr "Balík %s sa nedá nájsť"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je ozna�ený ako manuálne nainštalovaný.\n"
@@ -357,7 +357,7 @@ msgstr "Adresár pre sťahovanie sa nedá zamknúť"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nedá sa nájsť zdrojový balík pre %s"
@@ -390,7 +390,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
@@ -423,7 +423,7 @@ msgstr "Stiahnuť zdroj %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorých archívov."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Sťahovanie ukon�ené v režime „iba stiahnuť“"
 
@@ -432,32 +432,32 @@ msgstr "Sťahovanie ukon�ené v režime „iba stiahnuť“"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -466,17 +466,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:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žiadne závislosti na zostavenie.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,20 +485,20 @@ msgstr ""
 "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch "
 "„%s“"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -507,7 +507,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -515,30 +515,30 @@ msgid ""
 msgstr ""
 "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti na zostavenie %s nemožno splniť."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Záznam zmien %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -626,16 +626,20 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tento APT má schopnosti posvätnej kravy.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -644,6 +648,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -673,8 +678,9 @@ msgstr "%s bol už nastavený na podržanie.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s bol už nastavený na nepodržanie.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "ÄŒakalo sa na %s, ale nebolo to tam"
@@ -888,7 +894,7 @@ msgstr "Nedá sa vytvoriť socket"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nedá sa pripojiť dátový socket, uplynul �as spojenia"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Chyba"
 
@@ -934,7 +940,7 @@ msgstr "Uplynulo spojenie dátového socketu"
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedá prijať"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problém s hašovaním súboru"
 
@@ -1064,91 +1070,181 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Prázdne súbory nemôžu byť platné archívy"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do tohto súboru"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri �ítaní zo servera. Druhá strana ukon�ila spojenie"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Chyba pri �ítaní zo servera"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Výber zlyhal"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Uplynul �as spojenia"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Čaká sa na hlavi�ky"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Chybná hlavi�ka"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP server poslal neplatnú hlavi�ku odpovede"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP server poslal neplatnú hlavi�ku Content-Length"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP server poslal neplatnú hlavi�ku Content-Range"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má poškodenú podporu rozsahov"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Neznámy formát dátumu"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Už existuje "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Získava sa:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Chyba "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Prebieha spracovanie]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Výmena nosi�a: Vložte disk s názvom\n"
+" „%s“\n"
+"do mechaniky „%s“ a stla�te Enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Upozornenie o vierohodnosti bolo potla�ené.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Nainštalovať tieto nekontrolované balíky?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Zlyhalo stiahnutie %s  %s\n"
+
+#: apt-private/private-install.cc:82
 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:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnútorná chyba, Triedenie sa neukon�ilo"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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."
@@ -1156,52 +1252,48 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "�no, urob to, �o vravím!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1212,19 +1304,19 @@ msgstr ""
 "Ak chcete pokra�ovať, opíšte frázu „%s“\n"
 " ?]"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Prerušené."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Chcete pokra�ovať?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Niektoré súbory sa nedajú stiahnuť"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1232,19 +1324,19 @@ msgstr ""
 "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
 "fix-missing"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Chýbajúce balíky sa nedajú opraviť."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Inštalácia sa prerušuje."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1261,15 +1353,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1287,15 +1379,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnútorná chyba, AutoRemover nie�o pokazil"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1308,7 +1400,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1320,7 +1412,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 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“."
@@ -1339,7 +1431,7 @@ msgstr ""
 "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
 "navrhnite riešenie)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1351,71 +1443,71 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Nainštalujú sa nasledovné extra balíky:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Odporú�ané balíky:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Preskakuje sa %s, nie je nainštalovaný a bola vy6iadan8 iba aktualizácia.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s je už najnovšej verzie.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na mysli "
 "„%s“?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1424,136 +1516,120 @@ 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Nainštalovaný]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Nainštalovaný]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Nainštalovaný]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Nainštalovaný]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Nasledovné balíky majú nesplnené závislosti:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "ale nainštalovaný je %s"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale inštalovať sa bude %s"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ale sa nedá nainštalovať"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "ale je to virtuálny balík"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "ale nie je nainštalovaný"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "ale sa nebude inštalovať"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " alebo"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Nasledovné balíky majú nesplnené závislosti:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Nasledovné balíky sa ODSTR�NIA:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Nasledovné balíky sa ponechajú v sú�asnej verzii:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Nasledovné balíky sa aktualizujú:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Nasledovné balíky sa DEGRADUJÚ:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Nasledovné pridržané balíky sa zmenia:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (kvôli %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1561,27 +1637,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinštalovaných, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradovaných, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu iba �iasto�ne nainštalovaných alebo odstránených.\n"
@@ -1590,7 +1666,7 @@ msgstr "%lu iba �iasto�ne nainštalovaných alebo odstránených.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1598,37 +1674,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1643,39 +1710,6 @@ msgstr[2] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Upozornenie o vierohodnosti bolo potla�ené.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Nainštalovať tieto nekontrolované balíky?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Zlyhalo stiahnutie %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1686,74 +1720,45 @@ msgstr "Premenovanie %s na %s zlyhalo"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Príkaz update neprijíma žiadne argumenty"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Hotovo"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Už existuje "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Získava sa:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Chyba "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Prebieha spracovanie]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Výmena nosi�a: Vložte disk s názvom\n"
-" „%s“\n"
-"do mechaniky „%s“ a stla�te Enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nedá sa na�ítať %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1827,36 +1832,426 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Zlu�ujú sa dostupné informácie"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Hašovací prvok sa nedá nájsť!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nedá sa vyhodnotiť %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Nedá sa alokovať diverzia"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Do %s sa nedá zapisovať"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Vnútorná chyba pri AddDiversion"
+#: 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ý?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Zoznam rozšírení balíka je príliš dlhý"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s"
+msgid "Error processing directory %s"
+msgstr "Chyba pri spracovávaní adresára %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Chyba pri zapisovaní hlavi�ky do súboru"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dvojité pridanie diverzie %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Chyba pri spracovávaní obsahu %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Nevyhovel žiaden výber"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Duplicitný konfigura�ný súbor %s/%s"
+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:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nedá sa otvoriť DB súbor %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s sa nedá vyhodnotiť"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Nie je možné vykonať readlink %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Archív nemá riadiaci záznam"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Archív neobsahuje pole „package“"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr " %s nemá žiadnu položku override\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  správcom %s je %s, nie %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr " %s nemá žiadnu položku „source override“\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr " %s nemá žiadnu položku „binary override“\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Premenovanie %s na %s zlyhalo"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1882,17 +2277,6 @@ msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s"
 msgid "The diversion path is too long"
 msgstr "Diverzná cesta je príliš dlhá"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1921,30 +2305,36 @@ msgstr "Súbor %s/%s prepisuje ten z balíka %s"
 msgid "Unable to stat %s"
 msgstr "Nedá sa vyhodnotiť %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Zatvorenie súboru %s zlyhalo"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Hašovací prvok sa nedá nájsť!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Nedá sa alokovať diverzia"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Vnútorná chyba pri AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, 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“"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Vnútorná chyba, nedá sa nájsť �asť %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dvojité pridanie diverzie %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Nespracovateľný riadiaci súbor"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Duplicitný konfigura�ný súbor %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1992,197 +2382,52 @@ msgstr "Kontrolný sú�et pre tar zlyhal, archív je poškodený"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznáma TAR hlavi�ka typu %u, �len %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Spúšťa sa dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Systém balíkov „%s“ nie je podporovaný"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Zapísaných %i záznamov.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, 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 "This is not a valid DEB archive, missing '%s' member"
+msgstr "Toto nie je platný DEB archív, chýba �asť „%s“"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Vnútorná chyba, nedá sa nájsť �asť %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Nebolo možné nájsť autentifika�ný záznam pre: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Nespracovateľný riadiaci súbor"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Nezhoda kontrolných haš sú�tov: %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/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"
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Vyrovnávacia pamäť balíkov je prázdna"
-
-#: 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: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: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ý"
+msgid "List directory %spartial is missing."
+msgstr "Adresár zoznamov %spartial chýba."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Závisí na"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Predzávisí na"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Navrhuje"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Odporú�a"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Koliduje s"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Nahrádza"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Zneplatňuje"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Kazí"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Rozširuje"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "dôležitý"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "požadovaný"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "štandardný"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "voliteľný"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Archives directory %spartial is missing."
+msgstr "Archívny adresár %spartial chýba."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nedá sa nájsť ovláda� spôsobu %s."
+msgid "Unable to lock directory %s"
+msgstr "Adresár %s sa nedá zamknúť"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, 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:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Spôsob %s nebol správne spustený"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Indexový súbor typu „%s“ nie je podporovaný"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie je možné otvoriť StateFile %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie je možné zapísať do�asný StateFile %s"
+msgid "Retrieving file %li of %li"
+msgstr "Sťahuje sa %li. súbor z %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2202,7 +2447,7 @@ msgstr "Veľkosti sa nezhodujú"
 msgid "Invalid file format"
 msgstr "Neplatná operácia %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2211,16 +2456,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2229,12 +2474,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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2244,12 +2489,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:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2258,178 +2503,125 @@ 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, 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/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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
-
-#: 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: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: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ť."
+msgid "The method driver %s could not be found."
+msgstr "Nedá sa nájsť ovláda� spôsobu %s."
 
-#: 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/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/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Spôsob %s nebol správne spustený"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %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/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/algorithms.cc:265
+#, 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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
+#: 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Do %s sa nedá zapisovať"
+#: 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/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/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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Blok výrobcu %s neobsahuje otla�ok (fingerprint)"
+#: 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"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Adresár zoznamov %spartial chýba."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Nedá sa na�ítať zoznam zdrojov."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Archívny adresár %spartial chýba."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Adresár %s sa nedá zamknúť"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Nebola nájdená verzia „%s“ pre „%s“"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
+msgid "Couldn't find task '%s'"
+msgstr "Nebolo možné nájsť úlohu „%s“"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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."
+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/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/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/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Nie je možné vykonať stat %s."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
+"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
+"pretože nemá žiadnu z nich"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v "
-"man 5 apt.conf pod APT::Immediate-Configure (%d)"
+"Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je �isto "
+"virtuálny"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nedá sa nakonfigurovať „%s“."
+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/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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."
+"Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
+"nainštalovaný"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2513,53 +2705,86 @@ msgstr "Zapisuje sa nový zoznam zdrojov\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Nie je možné vykonať stat %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytvára sa strom závislostí"
 
-#: 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátske verzie"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "Nie je možné otvoriť StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie je možné zapísať do�asný StateFile %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Poslať scénár riešiteľovi"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Poslať požiadavku riešiteľovi"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Pripraviť sa na prijatie riešenia"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Spustiť externého riešiteľa"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Súbor %s sa nedá spracovať (1)"
+msgid "Wrote %i records.\n"
+msgstr "Zapísaných %i záznamov.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Súbor %s sa nedá spracovať (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Nebolo možné nájsť autentifika�ný záznam pre: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Nezhoda kontrolných haš sú�tov: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2586,6 +2811,218 @@ msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Chýba položka „Date“ v súbore Release %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Systém balíkov „%s“ nie je podporovaný"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Spúšťa sa dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nedá sa nakonfigurovať „%s“."
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Vyrovnávacia pamäť balíkov je prázdna"
+
+#: 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: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: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: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: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:321
+msgid "Depends"
+msgstr "Závisí na"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Predzávisí na"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Navrhuje"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Odporú�a"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Koliduje s"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Nahrádza"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Zneplatňuje"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Kazí"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Rozširuje"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "dôležitý"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "požadovaný"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "štandardný"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "voliteľný"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový súbor typu „%s“ nie je podporovaný"
+
+#: 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“ 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/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
+
 #: apt-pkg/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2662,238 +3099,144 @@ msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
 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/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:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Nebola nájdená verzia „%s“ pre „%s“"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nebolo možné nájsť úlohu „%s“"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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: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“"
+msgid "Unable to parse package file %s (1)"
+msgstr "Súbor %s sa nedá spracovať (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Súbor %s sa nedá spracovať (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-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:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je �isto "
-"virtuálny"
+"Niektoré indexové súbory sa nepodarilo stiahnuť. Boli ignorované alebo sa "
+"použili staršie verzie."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blok výrobcu %s neobsahuje otla�ok (fingerprint)"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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ý"
+msgid "Unable to stat the mount point %s"
+msgstr "Prípojný bod %s sa nedá vyhodnotiť"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "Inštaluje sa %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Nedá sa vykonať stat() CD-ROM"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "Nastavuje sa %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Parameter príkazového riadka „%c“ [z %s] je neznámy"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Odstraňuje sa %s"
+msgid "Command line option %s is not understood"
+msgstr "Nezrozumiteľný parameter %s na príkazovom riadku"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "Úplne sa odstraňuje %s"
+msgid "Command line option %s is not boolean"
+msgstr "Parameter príkazového riadku %s nie je pravdivostná hodnota"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Zaznamenali sme zmiznutie %s"
+msgid "Option %s requires an argument."
+msgstr "Voľba %s vyžaduje argument."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Vykonáva sa spúšťa� post-installation %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Parameter %s: Zadanie konfigura�nej položky musí obsahovať =<hodn>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Adresár „%s“ chýba"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Voľba %s vyžaduje ako argument celé �íslo (integer), nie „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Nedá sa otvoriť súbor „%s“"
+msgid "Option '%s' is too long"
+msgstr "Voľba „%s“ je príliš dlhá"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Pripravuje sa %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Nezrozumiteľný význam %s, skúste true alebo false. "
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Rozbaľuje sa %s"
+msgid "Invalid operation %s"
+msgstr "Neplatná operácia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Pripravuje sa nastavenie %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Nerozpoznaná skratka typu: „%c“"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "Nainštalovaný balík %s"
+msgid "Opening configuration file %s"
+msgstr "Otvára sa konfigura�ný súbor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Pripravuje sa odstránenie %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaktická chyba %s:%u: Blok za�ína bez názvu."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "Odstránený balík %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaktická chyba %s:%u: Skomolená zna�ka"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Pripravuje sa úplné odstránenie %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Balík „%s“ je úplne odstránený"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-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:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
-"zaplnený"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
-"pamäte"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
-"zaplnený"
+"Syntaktická chyba %s:%u: Direktívy sa dajú vykonať len na najvyššej úrovni"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, 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?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, 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?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, 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“. "
+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/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Nie je zamknuté"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3009,54 +3352,11 @@ msgstr "Problém pri odstraňovaní súboru %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Voľba %s nenájdená"
+msgid "No keyring installed in %s."
+msgstr "V %s nie je nainštalovaný žiaden zväzok kľú�ov."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3113,518 +3413,229 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
+msgid "%c%s... Error!"
+msgstr "%c%s... Chyba!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
+msgid "%c%s... Done"
+msgstr "%c%s... Hotovo"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Hotovo"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Voľba %s vyžaduje argument."
+msgid "%lid %lih %limin %lis"
+msgstr "%li d %li h %li min %li s"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Parameter %s: Zadanie konfigura�nej položky musí obsahovať =<hodn>."
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Voľba %s vyžaduje ako argument celé �íslo (integer), nie „%s“"
+msgid "%limin %lis"
+msgstr "%li min %li s"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Voľba „%s“ je príliš dlhá"
+msgid "%lis"
+msgstr "%li s"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Nezrozumiteľný význam %s, skúste true alebo false. "
+msgid "Selection %s not found"
+msgstr "Voľba %s nenájdená"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Zoznam rozšírení balíka je príliš dlhý"
+"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?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Chyba pri spracovávaní adresára %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Chyba pri zapisovaní hlavi�ky do súboru"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Chyba pri spracovávaní obsahu %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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:841
-msgid "No selections matched"
-msgstr "Nevyhovel žiaden výber"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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"
+"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“. "
 
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB je narušená, súbor je premenovaný na %s.old"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Nie je zamknuté"
 
-#: ftparchive/cachedb.cc:83
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
-
-#: ftparchive/cachedb.cc:94
-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."
+msgid "Installing %s"
+msgstr "Inštaluje sa %s"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nedá sa otvoriť DB súbor %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nie je možné vykonať readlink %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Archív nemá riadiaci záznam"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Nedá sa získať kurzor"
+msgid "Configuring %s"
+msgstr "Nastavuje sa %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Adresár %s sa nedá �ítať\n"
+msgid "Removing %s"
+msgstr "Odstraňuje sa %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:98
 #, 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 "
+msgid "Completely removing %s"
+msgstr "Úplne sa odstraňuje %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Chyba pri preklade %s"
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Prechod stromom zlyhal"
+msgid "Noting disappearance of %s"
+msgstr "Zaznamenali sme zmiznutie %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s sa nedá otvoriť"
+msgid "Running post-installation trigger %s"
+msgstr "Vykonáva sa spúšťa� post-installation %s"
 
-#: ftparchive/writer.cc:278
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Odlinkovanie %s [%s]\n"
+msgid "Directory '%s' missing"
+msgstr "Adresár „%s“ chýba"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Nie je možné vykonať readlink %s"
+msgid "Could not open file '%s'"
+msgstr "Nedá sa otvoriť súbor „%s“"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Nie je možné vykonať unlink %s"
+msgid "Preparing %s"
+msgstr "Pripravuje sa %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nepodarilo sa zlinkovať %s s %s"
+msgid "Unpacking %s"
+msgstr "Rozbaľuje sa %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archív neobsahuje pole „package“"
+msgid "Preparing to configure %s"
+msgstr "Pripravuje sa nastavenie %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s nemá žiadnu položku override\n"
+msgid "Installed %s"
+msgstr "Nainštalovaný balík %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  správcom %s je %s, nie %s\n"
+msgid "Preparing for removal of %s"
+msgstr "Pripravuje sa odstránenie %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s nemá žiadnu položku „source override“\n"
+msgid "Removed %s"
+msgstr "Odstránený balík %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s nemá žiadnu položku „binary override“\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Zlyhal pokus o pridelenie pamäti"
+msgid "Preparing to completely remove %s"
+msgstr "Pripravuje sa úplné odstránenie %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nedá sa otvoriť %s"
+msgid "Completely removed %s"
+msgstr "Balík „%s“ je úplne odstránený"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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"
+msgid "Can not write log (%s)"
+msgstr "Do %s sa nedá zapisovať"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Zlyhalo vytvorenie FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Volanie fork() zlyhalo"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimovať potomka"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "Operácia bola prerušená predtým, než sa stihla dokon�iť"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "V/V operácia s podprocesom/súborom zlyhala"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Chyba �ítania pri výpo�te MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v "
+"nadväznosti na predošlé zlyhanie."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problém s odlinkovaním %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
+"zaplnený"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
+"pamäte"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Neznámy záznam o balíku!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
+"zaplnený"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Nezapíše sa správa apport, pretože chybová správa indikuje V/V chybu dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
 
 #~ 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 f2fccd7d0..69bf678d0 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -99,74 +99,74 @@ msgstr "Celotna velikost, izra�unana za: "
 msgid "Package file %s is out of sync."
 msgstr "Datoteka paketa %s ni usklajena."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Podati morate vsaj en iskalni vzorec"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni mogo�e najti paketa %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Pripeti paketi:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(ni najdeno)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Nameš�en: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(brez)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Bucika paketa: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Preglednica razli�ic:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -325,7 +325,7 @@ msgid "Couldn't find package %s"
 msgstr "Ni mogo�e najti paketa %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je bil nastavljen na ro�no nameš�en.\n"
@@ -356,7 +356,7 @@ 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Izvornega paketa za %s ni mogo�e najti"
@@ -387,7 +387,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskok že prejete datoteke '%s'\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ni mogo�e dolo�iti prostega prostora v %s"
@@ -420,7 +420,7 @@ msgstr "Dobi vir %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Nekaterih arhivov ni mogo�e pridobiti."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Prejem je dokon�an in uporabljen je na�in samo prejema"
 
@@ -429,32 +429,32 @@ msgstr "Prejem je dokon�an in uporabljen je na�in samo prejema"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Ukaz gradnje '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Podrejeno opravilo ni uspelo"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -463,17 +463,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:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nima odvisnosti za gradnjo.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -481,20 +481,20 @@ msgid ""
 msgstr ""
 "odvisnosti %s za %s ni mogo�e zadovoljiti, ker %s ni dovoljen na paketih '%s'"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -503,7 +503,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -512,30 +512,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Obdelava odvisnosti za gradnjo je spodletela"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Dnevnik sprememb za %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -622,17 +622,21 @@ msgstr ""
 " sources.list(5) in apt.conf(5). \n"
 "                       Ta APT ima mo�i super krav.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -641,6 +645,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -670,8 +675,9 @@ msgstr "paket %s je bil že nastavljen kot na �akanju.\n"
 msgid "%s was already not hold.\n"
 msgstr "paket %s je bil že nastavljen kot ne na �akanju.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Program je �akal na %s a ga ni bilo tam"
@@ -884,7 +890,7 @@ msgstr "Ni mogo�e ustvariti vti�a"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Ni mogo�e povezati podatkovnega vti�a. Povezava je zakasnela."
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Spodletelo"
 
@@ -930,7 +936,7 @@ msgstr "Povezava podatkovne vti�nice je zakasnela"
 msgid "Unable to accept connection"
 msgstr "Ni mogo�e sprejeti povezave"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Težava med razprševanjem datoteke"
 
@@ -1060,91 +1066,181 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Napaka med branjem s strežnika"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Izbira ni uspela"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Povezava je zakasnela"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Napaka med pisanjem v izhodno datoteko"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "ÄŒakanje na glave"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Neveljavna vrstica glave"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Strežnik HTTP je poslal neveljavno glavo odgovora"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Strežnik HTTP je poslal glavo z neveljavnim obsegom vsebine"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Neznana oblika datuma"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Napa�ni podatki glave"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Zadetek "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Dobi:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Prezr "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Nap "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Delo]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Sprememba medija: vstavite disk z oznako\n"
+" '%s'\n"
+"v enoto '%s' in pritisnite vnosno tipko\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "POZOR: Naslednjih paketov ni bilo mogo�e overiti!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Opozorilo overitve je bilo prepisano.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Nekaterih paketkov bi bilo mogo�e overiti"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Ali želite te pakete namestiti brez preverjanja?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Notranja napaka, Urejanje se ni kon�alo"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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."
@@ -1152,52 +1248,48 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Na %s je premalo prostora."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Da, naredi tako kot pravim!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1208,19 +1300,19 @@ msgstr ""
 "Za nadaljevanje vtipkajte frazo '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Prekini."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Ali želite nadaljevati?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Prejem nekaterih datotek ni uspel"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1228,19 +1320,19 @@ msgstr ""
 "Nekaterih arhivov ni mogo�e dobiti. Poskusite uporabiti apt-get update ali --"
 "fix-missing."
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Ni mogo�e popraviti manjkajo�ih paketov."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Prekinjanje namestitve."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1260,17 +1352,17 @@ msgstr[3] ""
 "Naslednji paketi so izginili z vašega sistema, ker so vse\n"
 "datoteke prepisali drugi paketi:"
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1289,15 +1381,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1309,7 +1401,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:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1319,7 +1411,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:518
+#: apt-private/private-install.cc:519
 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."
@@ -1339,7 +1431,7 @@ msgstr ""
 "Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
 "navedite rešitev)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1351,69 +1443,69 @@ msgstr ""
 ", da nekateri zahtevani paketi Å¡e niso ustvarjeni ali premaknjeni\n"
 " iz Prihajajo�ega."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Pokvarjeni paketi"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Naslednji dodatni paketi bodo nameš�eni:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Predlagani paketi:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Priporo�eni paketi:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s je presko�en, ker je že nameš�en in ne potrebuje nadgradnje.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Preskok %s, ni nameš�en in zahtevane so le nadgradnje\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Najnovejša razli�ica %s je že nameš�ena.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Izbrana razli�ica '%s' (%s) za '%s'\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Izbrana razli�ica '%s' (%s) za '%s' namesto '%s'\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Paket '%s' ni nameš�en, zato ni bil odstranjen. Ali ste mislili '%s'?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Paket '%s' ni nameš�en, zato ni bil odstranjen\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1423,136 +1515,120 @@ 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Nameš�eno]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Nameš�eno]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Nameš�eno]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Nameš�eno]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Naslednji paketi imajo nerešene odvisnosti:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "vendar je paket %s nameš�en"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "vendar bo paket %s nameš�en"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "vendar se ga ne da namestiti"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "vendar je navidezen paket"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "vendar ni nameš�en"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "vendar ne bo nameš�en"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " ali"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Naslednji paketi imajo nerešene odvisnosti:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Naslednji NOVI paketi bodo nameš�eni:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Naslednji paketi so bili zadržani:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Naslednji paketi bodo nadgrajeni:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Naslednji paketi bodo POSTARANI:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Naslednji zadržani paketi bodo spremenjeni:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (zaradi %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1560,27 +1636,27 @@ msgstr ""
 "OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
 "Tega NE storite, razen �e ne veste natanko kaj po�enjate!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu nadgrajenih, %lu na novo nameš�enih, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu posodobljenih, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu postaranih, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ne popolnoma nameš�enih ali odstranjenih.\n"
@@ -1589,7 +1665,7 @@ msgstr "%lu ne popolnoma nameš�enih ali odstranjenih.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1597,38 +1673,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1644,39 +1710,6 @@ msgstr[3] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "POZOR: Naslednjih paketov ni bilo mogo�e overiti!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Opozorilo overitve je bilo prepisano.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Nekaterih paketkov bi bilo mogo�e overiti"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Ali želite te pakete namestiti brez preverjanja?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1687,74 +1720,46 @@ msgstr "Ni mogo�e preimenovati %s v %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Ukaz update ne sprejema argumentov"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Opravljeno"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Zadetek "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Dobi:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Prezr "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Nap "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Delo]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Sprememba medija: vstavite disk z oznako\n"
-" '%s'\n"
-"v enoto '%s' in pritisnite vnosno tipko\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni mogo�e brati %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1829,36 +1834,428 @@ 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"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode je poklical stabilno povezano vozliš�e"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Ni mogo�e najti razpršenega elementa!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ni mogo�e dolo�iti %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Ni mogo�e dodeliti odklona"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ni mogo�e pisati na %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Notranja napaka v AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Seznam razširitev paketov je predolg"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s"
+msgid "Error processing directory %s"
+msgstr "Napaka med obdelavo mape %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Seznam razširitev virov je predolg"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Napaka med pisanjem glave v datoteko vsebine"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dvojni seštevek odklona %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Napaka med obdelavo vsebine %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Nobena izbira se ne ujema"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Dvojnik datoteke z nastavitvami %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'"
+
+#: ftparchive/cachedb.cc:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "PZ je star, poskušanje nadgradnje %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni mogo�e odprti datoteke PZ %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Napaka med dolo�itvijo %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Napaka med branjem povezave %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arhiv nima nadzornega zapisa"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Arhiv ni imel polja s paketom"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nima prepisanega vnosa\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Vzdrževalec %s je %s in ne %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nima izvornega vnosa prepisa\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s nima tudi binarnega vnosa prepisa\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Ni mogo�e preimenovati %s v %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1884,17 +2281,6 @@ msgstr "Paket poskuša pisati v tar�o odklona %s/%s"
 msgid "The diversion path is too long"
 msgstr "Pot odklona je predloga"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1923,30 +2309,36 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
 msgid "Unable to stat %s"
 msgstr "Ni mogo�e dolo�iti %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode je poklical stabilno povezano vozliš�e"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Napaka med zapiranjem datoteke %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Ni mogo�e najti razpršenega elementa!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Ni mogo�e dodeliti odklona"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Notranja napaka v AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "To ni veljaven arhiv DEB. Manjka �lan '%s'."
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Notranja napaka. Ni mogo�e najti �lana %s."
+msgid "Double add of diversion %s -> %s"
+msgstr "Dvojni seštevek odklona %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Nadzorne datoteke ni mogo�e raz�leniti"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Dvojnik datoteke z nastavitvami %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1994,199 +2386,52 @@ msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznana vrsta glave TAR %u, �lan %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Poganjanje dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Paketni sistem '%s' ni podprt"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Zapisanih je bilo %i zapisov.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, 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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Zapisanih je bilo %i zapisov z %i neujemajo�imi datotekami.\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "To ni veljaven arhiv DEB. Manjka �lan '%s'."
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Notranja napaka. Ni mogo�e najti �lana %s."
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Ni mogo�e najti zapisa overitve za: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Nadzorne datoteke ni mogo�e raz�leniti"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Neujemanje razpršila za: %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/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."
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Prazen predpomnilnik paketov"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Datoteka s predpomnilnikom paketov je pokvarjena"
-
-#: 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:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Datoteka predpomnilnika paketa je okvarjena. Je premajhna"
+msgid "List directory %spartial is missing."
+msgstr "Mapa seznama %spartial manjka."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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: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:321
-msgid "Depends"
-msgstr "Odvisen od"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Predodvisen od"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Priporo�a"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Priporo�a"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "V sporu z"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Zamenja"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Zastara"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Pokvari"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Izboljša"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "pomembno"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "obvezno"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "obi�ajni"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "izbirno"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "dodatno"
+msgid "Archives directory %spartial is missing."
+msgstr "Mapa arhivov %spartial manjka."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Gonilnika na�inov %s ni mogo�e najti."
+msgid "Unable to lock directory %s"
+msgstr "Mape %s ni mogo�e zakleniti"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Izberite, �e je paket 'dpkg-dev' nameš�en.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Na�in %s se ni za�el pravilno"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Odpiranje DatotekeStanja %s je spodletelo"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Pridobivanje datoteke %li od %li (%s preostalo)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Pisanje za�asne DatotekeStanja %s je spodletelo"
+msgid "Retrieving file %li of %li"
+msgstr "Pridobivanje datoteke %li od %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2206,7 +2451,7 @@ msgstr "Neujemanje velikosti"
 msgid "Invalid file format"
 msgstr "Neveljavno opravilo %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2215,16 +2460,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2233,12 +2478,12 @@ msgstr ""
 "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
 "skladiš�e ne bo uveljavljena."
 
-#: apt-pkg/acquire-item.cc:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2248,12 +2493,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:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Napaka GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2262,12 +2507,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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2275,165 +2520,111 @@ msgstr ""
 "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
 "%s."
 
-#: 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: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
+#: apt-pkg/acquire-worker.cc:116
 #, 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: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: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: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."
+msgid "The method driver %s could not be found."
+msgstr "Gonilnika na�inov %s ni mogo�e najti."
 
-#: 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/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/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Na�in %s se ni za�el pravilno"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Ni mogo�e dolo�iti seznama izvornih paketov %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/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/algorithms.cc:265
+#, 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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Zbiranje dobaviteljev datotek"
+#: 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/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/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/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
+#: 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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa"
+#: 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."
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Mapa seznama %spartial manjka."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Seznama virov ni mogo�e brati."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Mapa arhivov %spartial manjka."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Izdaje '%s' za '%s' ni mogo�e najti"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Mape %s ni mogo�e zakleniti"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Razli�ice '%s' za '%s' ni mogo�e najti"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Pridobivanje datoteke %li od %li (%s preostalo)"
+msgid "Couldn't find task '%s'"
+msgstr "Ni mogo�e najti naloge '%s'"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Z logi�nim izrazom '%s' ni mogo�e najti nobenega paketa"
 
-#: 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/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/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Ni mogo�e dolo�iti %s."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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/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�."
+"Ni mogo�e izbrati nameš�ene razli�ice ali razli�ice kandidata iz paketa "
+"'%s', saj nima nobenega od njiju"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"Ni mogo�e izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod "
-"APT::Immediate-Configure za podrobnosti. (%d)"
+"Ni mogo�e izbrati najnovejše razli�ice iz paketa '%s', saj je popolnoma "
+"navidezen"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "Ni mogo�e nastaviti '%s' "
+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/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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."
+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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2517,53 +2708,88 @@ msgstr "Pisanje novega seznama virov\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Izvorni vnosi za ta disk so:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Ni mogo�e dolo�iti %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradnja drevesa odvisnosti"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Razli�ice kandidatov"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ustvarjanje odvisnosti"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "Odpiranje DatotekeStanja %s je spodletelo"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Pisanje za�asne DatotekeStanja %s je spodletelo"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Pošlji scenarij reševalniku"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Pošlji zahtevo reševalniku"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Priprava za rešitev prejemanja"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 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:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Izvedi zunanji reševalnik"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ni mogo�e raz�leniti datoteke paketa %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Zapisanih je bilo %i zapisov.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ni mogo�e raz�leniti datoteke paketa %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Zapisanih je bilo %i zapisov z %i manjkajo�imi datotekami.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Zapisanih je bilo %i zapisov z %i neujemajo�imi datotekami.\n"
+
+#: 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 ""
+"Zapisanih je bilo %i zapisov z %i manjkajo�imi datotekami in %i "
+"neujemajo�imi datotekami.\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Ni mogo�e najti zapisa overitve za: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Neujemanje razpršila za: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2590,6 +2816,216 @@ msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Paketni sistem '%s' ni podprt"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Poganjanje dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Ni mogo�e nastaviti '%s' "
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Prazen predpomnilnik paketov"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Datoteka s predpomnilnikom paketov je pokvarjena"
+
+#: 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:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Datoteka predpomnilnika paketa je okvarjena. Je premajhna"
+
+#: 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: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:321
+msgid "Depends"
+msgstr "Odvisen od"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Predodvisen od"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Priporo�a"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Priporo�a"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "V sporu z"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Zamenja"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Zastara"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Pokvari"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Izboljša"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "pomembno"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "obvezno"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "obi�ajni"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "izbirno"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "dodatno"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Zbiranje dobaviteljev datotek"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
+
+#: 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 ""
+"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/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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2671,237 +3107,144 @@ msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
 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/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: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:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Ni mogo�e najti naloge '%s'"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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: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"
+msgid "Unable to parse package file %s (1)"
+msgstr "Ni mogo�e raz�leniti datoteke paketa %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Ni mogo�e raz�leniti datoteke paketa %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-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:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Ni mogo�e izbrati najnovejše razli�ice iz paketa '%s', saj je popolnoma "
-"navidezen"
+"Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile "
+"namesto njih uporabljene stare."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Ni mogo�e dolo�iti priklopne to�ke %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "Nameš�anje %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Ni mogo�e dolo�iti CD-ROM-a"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "Nastavljanje %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Možnost ukazne vrstice '%c' [iz %s] ni poznana."
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Odstranjevanje %s"
+msgid "Command line option %s is not understood"
+msgstr "Možnosti ukazne vrstice %s ni mogo�e razumeti"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "%s je bil popolnoma odstranjen"
+msgid "Command line option %s is not boolean"
+msgstr "Možnost ukazne vrstice %s ni boolova vrednost"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "%s je izginil"
+msgid "Option %s requires an argument."
+msgstr "Možnost %s zahteva argument."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Poganjanje sprožilca po namestitvi %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Možnost %s: Dolo�ilo predmeta nastavitve zahtevajo =<val>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Mapa '%s' manjka"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Možnost %s zahteva celoštevilski argument, ne '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Ni mogo�e odpreti datoteke '%s'"
+msgid "Option '%s' is too long"
+msgstr "Možnost '%s' je predolga"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Pripravljanje %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Pomena %s ni mogo�e razumeti, poskusite pravilno ali napa�no."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Razširjanje %s"
+msgid "Invalid operation %s"
+msgstr "Neveljavno opravilo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Pripravljanje na nastavljanje %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Neprepoznana vrsta okrajšave: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "%s je bil nameš�en"
+msgid "Opening configuration file %s"
+msgstr "Odpiranje nastavitvene datoteke %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Pripravljanje na odstranitev %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Skladenjska napaka %s:%u: Blok se za�ne brez imena."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "%s je bil odstranjen"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Skladenjska napaka %s:%u: Slabo oblikovana oznaka."
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Pripravljanje na popolno odstranitev %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Skladenjska napaka %s:%u: Dodatna krama za vrednostjo."
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s je bil popolnoma odstranjen"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "Opravilo je bilo prekinjeno preden se je lahko kon�alo"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "težave odvisnosti - puš�anje nenastavljenega"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Poro�ilo apport ni bilo napisano, ker sporo�ilo o napaki nakazuje na napako "
-"polnega diska"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Poro�ilo apport ni bilo napisano, ker sporo�ilo o napaki nakazuje na napako "
-"zaradi pomanjkanja pomnilnika"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Poro�ilo apport je bilo napisano, ker sporo�ilo o napaki nakazuje na težavo "
-"na krajevnem sistemu"
+"Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnji ravni."
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-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/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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Skrbniške mape (%s) ni mogo�e zakleniti. Jo morda uporablja drugo opravilo?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Skladenjska napaka %s:%u: Vklju�eno od tu"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, 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?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, 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'. "
+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/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Ni zaklenjeno"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3017,54 +3360,11 @@ msgstr "Težava med razvezovanjem datoteke %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Izbire %s ni mogo�e najti"
+msgid "No keyring installed in %s."
+msgstr "V %s ni nameš�enih zbirk klju�ev."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3120,520 +3420,231 @@ msgid ""
 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Skladenjska napaka %s:%u: Vklju�eno od tu"
+msgid "%c%s... Error!"
+msgstr "%c%s ... Napaka!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
+msgid "%c%s... Done"
+msgstr "%c%s ... Narejeno"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s ... Narejeno"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Možnost %s zahteva argument."
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Možnost %s: Dolo�ilo predmeta nastavitve zahtevajo =<val>."
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Možnost %s zahteva celoštevilski argument, ne '%s'"
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Možnost '%s' je predolga"
+msgid "%lis"
+msgstr "%lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Pomena %s ni mogo�e razumeti, poskusite pravilno ali napa�no."
+msgid "Selection %s not found"
+msgstr "Izbire %s ni mogo�e najti"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Seznam razširitev paketov je predolg"
+"Skrbniške mape (%s) ni mogo�e zakleniti. Jo morda uporablja drugo opravilo?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Napaka med obdelavo mape %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Seznam razširitev virov je predolg"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Napaka med pisanjem glave v datoteko vsebine"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Skrbniške mape (%s) ni mogo�e zakleniti. Ali ste skrbnik?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Napaka med obdelavo vsebine %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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:841
-msgid "No selections matched"
-msgstr "Nobena izbira se ne ujema"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'"
+"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'. "
 
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Ni zaklenjeno"
 
-#: ftparchive/cachedb.cc:83
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "PZ je star, poskušanje nadgradnje %s"
-
-#: ftparchive/cachedb.cc:94
-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."
+msgid "Installing %s"
+msgstr "Nameš�anje %s"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ni mogo�e odprti datoteke PZ %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Napaka med branjem povezave %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arhiv nima nadzornega zapisa"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Ni mogo�e najti kazalke"
+msgid "Configuring %s"
+msgstr "Nastavljanje %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "O: ni mogo�e brati mape %s\n"
+msgid "Removing %s"
+msgstr "Odstranjevanje %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:98
 #, 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 "
+msgid "Completely removing %s"
+msgstr "%s je bil popolnoma odstranjen"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:99
 #, 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"
+msgid "Noting disappearance of %s"
+msgstr "%s je izginil"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Failed to open %s"
-msgstr "Ni mogo�e odprti %s"
+msgid "Running post-installation trigger %s"
+msgstr "Poganjanje sprožilca po namestitvi %s"
 
-#: ftparchive/writer.cc:278
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " RazVeži %s [%s]\n"
+msgid "Directory '%s' missing"
+msgstr "Mapa '%s' manjka"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Napaka med branjem povezave %s"
+msgid "Could not open file '%s'"
+msgstr "Ni mogo�e odpreti datoteke '%s'"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Napaka med odvezovanjem %s"
+msgid "Preparing %s"
+msgstr "Pripravljanje %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Napaka med povezovanjem %s in %s"
+msgid "Unpacking %s"
+msgstr "Razširjanje %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Dosežena meja RazVezovanja %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arhiv ni imel polja s paketom"
+msgid "Preparing to configure %s"
+msgstr "Pripravljanje na nastavljanje %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nima prepisanega vnosa\n"
+msgid "Installed %s"
+msgstr "%s je bil nameš�en"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Vzdrževalec %s je %s in ne %s\n"
+msgid "Preparing for removal of %s"
+msgstr "Pripravljanje na odstranitev %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nima izvornega vnosa prepisa\n"
+msgid "Removed %s"
+msgstr "%s je bil odstranjen"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nima tudi binarnega vnosa prepisa\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Napaka med dodeljevanjem pomnilnika"
+msgid "Preparing to completely remove %s"
+msgstr "Pripravljanje na popolno odstranitev %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unable to open %s"
-msgstr "Ni mogo�e odpreti %s"
+msgid "Completely removed %s"
+msgstr "%s je bil popolnoma odstranjen"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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"
+msgid "Can not write log (%s)"
+msgstr "Ni mogo�e pisati na %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Ustvarjanje DATOTEKE* ni uspelo"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Vejitev ni uspela"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Podrejeni predmet stiskanja"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "Opravilo je bilo prekinjeno preden se je lahko kon�alo"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Notranja napaka. Ni mogo�e ustvariti %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+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"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "VI podopravila/datoteke je spodletel"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "težave odvisnosti - puš�anje nenastavljenega"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Med ra�unanjem MD5 ni mogo�e brati"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Poro�ilo apport ni bilo napisano, ker sporo�ilo o napaki nakazuje na "
+"navezujo�o napako iz predhodne napake."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Napaka med odvezovanjem %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Poro�ilo apport ni bilo napisano, ker sporo�ilo o napaki nakazuje na napako "
+"polnega diska"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Poro�ilo apport ni bilo napisano, ker sporo�ilo o napaki nakazuje na napako "
+"zaradi pomanjkanja pomnilnika"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Neznan zapis paketa!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Poro�ilo apport je bilo napisano, ker sporo�ilo o napaki nakazuje na težavo "
+"na krajevnem sistemu"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Poro�ilo apport ni bilo napisano, ker sporo�ilo o napaki nakazuje na napako "
+"dpkg V/I"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Notranja napaka zaradi AllUpgrade."
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ni veljaven paket DEB."
diff --git a/po/sv.po b/po/sv.po
index 8bd1d0f20..5d11f06c2 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -99,74 +99,74 @@ msgstr "Totalt utrymme som kan redogöras för: "
 msgid "Package file %s is out of sync."
 msgstr "Paketfilen %s är inte synkroniserad."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Du måste ange minst ett sökmönster"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "\"Package\"-filer:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Fastnålade paket:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(hittades inte)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Installerad: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Paketnålning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Versionstabell:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -328,7 +328,7 @@ msgid "Couldn't find package %s"
 msgstr "Kunde inte hitta paketet %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s är satt till manuellt installerad.\n"
@@ -356,7 +356,7 @@ msgstr "Kunde inte låsa hämtningskatalogen"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunde inte hitta något källkodspaket för %s"
@@ -388,7 +388,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar över redan hämtade filen \"%s\"\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunde inte fastställa ledigt utrymme i %s"
@@ -421,7 +421,7 @@ msgstr "Hämtar källkoden %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Misslyckades med att hämta vissa arkiv."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
 
@@ -430,47 +430,47 @@ msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggkommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Barnprocessen misslyckades"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,7 +479,7 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -488,14 +488,14 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -504,7 +504,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:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,31 +513,31 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggberoenden för %s kunde inte tillfredsställas."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Misslyckades med att behandla byggberoenden"
 
 # Felmeddelande för misslyckad chdir
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Ansluter till %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -625,16 +625,20 @@ msgstr ""
 "för mer information och flaggor.\n"
 "                     Denna APT har Speciella Ko-Krafter.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -643,6 +647,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -672,8 +677,9 @@ msgstr "%s är redan den senaste versionen.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s är redan den senaste versionen.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Väntade på %s men den fanns inte där"
@@ -867,7 +873,7 @@ msgstr "Kunde inte skapa ett uttag (socket)"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Misslyckades"
 
@@ -913,7 +919,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutningen"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem med att lägga filen till hashtabellen"
 
@@ -1051,91 +1057,186 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "\"Select\" misslyckades"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Anslutningen överskred tidsgränsen"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Väntar på rubriker"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Felaktig rubrikrad"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-servern sände ett ogiltigt svarshuvud"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 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:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Okänt datumformat"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Felaktiga data i huvud"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+# Måste vara tre bokstäver(?)
+# "Hit" = aktuell version är fortfarande giltig
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Bra "
+
+# "Get:" = hämtar ny version
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Läs:"
+
+# "Ign" = hoppar över
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ign "
+
+# "Err" = fel vid hämtning
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Fel "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Arbetar]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Mediabyte: Mata in skivan med etiketten\n"
+" \"%s\"\n"
+"i enheten \"%s\" och tryck på Enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "VARNING: Följande paket kunde inte autentiseras!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Autentiseringsvarning åsidosatt.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "NÃ¥gra av paketen kunde inte autentiseras"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Installera dessa paket utan verifiering?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internt fel. Sorteringen färdigställdes inte"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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."
@@ -1143,21 +1244,21 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1165,31 +1266,27 @@ 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
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Ja, gör som jag säger!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1201,19 +1298,19 @@ msgstr ""
 " ?] "
 
 # Visas då man svarar nej
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Avbryter."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Misslyckades med att hämta vissa filer"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1221,19 +1318,19 @@ msgstr ""
 "Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --"
 "fix-missing."
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Kunde inte korrigera saknade paket."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Avbryter installationen."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1247,16 +1344,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1274,15 +1371,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internt fel, AutoRemover förstörde något"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1293,7 +1390,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Följande paket har installerats automatiskt och är inte längre nödvändiga:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1303,7 +1400,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1322,7 +1419,7 @@ msgstr ""
 "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
 "(eller ange en lösning)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1334,71 +1431,71 @@ msgstr ""
 "att några nödvändiga paket ännu inte har skapats eller flyttats\n"
 "ut från \"Incoming\"."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Trasiga paket"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Följande ytterligare paket kommer att installeras:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Föreslagna paket:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Rekommenderade paket:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Hoppar över %s, det är inte installerat och endast uppgraderingar har "
 "begärts.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s är redan den senaste versionen.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1406,136 +1503,120 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Installerat]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Installerat]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Installerat]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Installerat]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s är installerat"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s kommer att installeras"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "men det kan inte installeras"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "men det är ett virtuellt paket"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "men det är inte installerat"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "men det kommer inte att installeras"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " eller"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Följande NYA paket kommer att installeras:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Följande paket kommer att TAS BORT:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Följande paket har hållits tillbaka:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Följande paket kommer att uppgraderas:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Följande paket kommer att NEDGRADERAS:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Följande tillbakahållna paket kommer att ändras:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (på grund av %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1543,27 +1624,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu att uppgradera, %lu att nyinstallera, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu att installera om, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu att nedgradera, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu är inte helt installerade eller borttagna.\n"
@@ -1572,7 +1653,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[J/n]"
 
@@ -1580,36 +1661,28 @@ msgstr "[J/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1623,39 +1696,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "VARNING: Följande paket kunde inte autentiseras!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Autentiseringsvarning åsidosatt.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "NÃ¥gra av paketen kunde inte autentiseras"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Installera dessa paket utan verifiering?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1666,80 +1706,45 @@ msgstr "Misslyckades med att byta namn på %s till %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Uppdateringskommandot tar inga argument"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Färdig"
 
-# Måste vara tre bokstäver(?)
-# "Hit" = aktuell version är fortfarande giltig
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Bra "
-
-# "Get:" = hämtar ny version
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Läs:"
-
-# "Ign" = hoppar över
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-# "Err" = fel vid hämtning
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Fel "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Arbetar]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Mediabyte: Mata in skivan med etiketten\n"
-" \"%s\"\n"
-"i enheten \"%s\" och tryck på Enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, 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/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1815,36 +1820,434 @@ msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera ig
 msgid "Merging available information"
 msgstr "Sammanfogar tillgänglig information"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode anropat på fortfarande länkad nod"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Misslyckades med att hitta hash-elementet!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Kunde inte ta status på %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Misslyckades med att allokera omdirigering"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kunde inte skriva till %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Internt fel i AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Listan över filtillägg för Packages är för lång"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Fel vid behandling av katalogen %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Listan över filtillägg för Sources är för lång"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Fel vid skrivning av rubrik till innehållsfil"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Omdirigeringen %s -> %s inlagd två gånger"
+msgid "Error processing contents %s"
+msgstr "Fel vid behandling av innehållet %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Inga val träffades"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Duplicerad konfigurationsfil %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "NÃ¥gra filer saknas i paketfilsgruppen \"%s\""
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB var skadad, filen omdöpt till %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB är gammal, försöker uppgradera %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Kunde inte öppna DB-filen %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Misslyckades med att ta status på %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Misslyckades med att läsa länken %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen styrpost"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Arkivet har inget package-fält"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, 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:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  ansvarig för paketet %s är %s ej %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s har ingen källåsidosättningspost\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s har heller ingen binär åsidosättningspost\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Misslyckades med att byta namn på %s till %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1870,17 +2273,6 @@ msgstr "Paketet försöker att skriva till omdirigeringsmålet %s/%s"
 msgid "The diversion path is too long"
 msgstr "Omdirigeringssökvägen är för lång"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1909,30 +2301,36 @@ msgstr "Filen %s/%s skriver över den i paketet %s"
 msgid "Unable to stat %s"
 msgstr "Kunde inte ta status på %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode anropat på fortfarande länkad nod"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Misslyckades med att stänga filen %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Misslyckades med att hitta hash-elementet!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Misslyckades med att allokera omdirigering"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Internt fel i AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Internt fel, kunde inta hitta delen %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Omdirigeringen %s -> %s inlagd två gånger"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Kunde inte tolka control-filen"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Duplicerad konfigurationsfil %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1980,203 +2378,52 @@ msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Okänd TAR-rubriktyp %u, del %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Kör dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Paketsystemet \"%s\" stöds inte"
-
-#
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Skrev %i poster.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Skrev %i poster med %i saknade filer.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Skrev %i poster med %i filer som inte stämmer\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, 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 "Internal error, could not locate member %s"
+msgstr "Internt fel, kunde inta hitta delen %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Kan inte hitta autentiseringspost för: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Kunde inte tolka control-filen"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash-kontrollsumman stämmer inte för: %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/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\""
-
-#: 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:155
-msgid "Empty package cache"
-msgstr "Paketcachen är tom"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Paketcachefilen är skadad"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "Paketcachefilens version är inkompatibel"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Paketcachefilen är skadad"
+msgid "List directory %spartial is missing."
+msgstr "Listkatalogen %spartial saknas."
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, 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:179
-msgid "The package cache was built for a different architecture"
-msgstr "Paketcachen byggdes för en annan arkitektur"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Beroende av"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Förberoende av"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Föreslår"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Rekommenderar"
-
-# "Konfliktar"?
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Står i konflikt med"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Ersätter"
-
-# "Föråldrar"?
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Föråldrar"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Gör sönder"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Utökar"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "viktigt"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "nödvändigt"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standard"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "valfri"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "Archives directory %spartial is missing."
+msgstr "Arkivkatalogen %spartial saknas."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoddrivrutinen %s kunde inte hittas."
+msgid "Unable to lock directory %s"
+msgstr "Kunde inte låsa katalogen %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, 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:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startade inte korrekt"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Indexfiler av typ \"%s\" stöds inte"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Misslyckades med att öppna StateFile %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Hämtar fil %li av %li (%s återstår)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Misslyckades med att skriva temporär StateFile %s"
+msgid "Retrieving file %li of %li"
+msgstr "Hämtar fil %li av %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2196,35 +2443,35 @@ msgstr "Storleken stämmer inte"
 msgid "Invalid file format"
 msgstr "Felaktig åtgärd %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2235,12 +2482,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fel: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2249,179 +2496,129 @@ 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, 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/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Cachen har ett inkompatibelt versionssystem"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Metoddrivrutinen %s kunde inte hittas."
 
-# 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: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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fel uppstod vid hantering av %s (FindPkg)"
-
-#: 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: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: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: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."
+msgid "Is the package %s installed?"
+msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startade inte korrekt"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunde inte ta status på källkodspaketlistan %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/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"
+#: 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 ""
+"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
 
-# Bättre ord?
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar filtillhandahållningar"
+#: 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kunde inte skriva till %s"
+#: 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/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "In-/utfel vid lagring av källcache"
+#: 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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Leverantörsblocket %s saknar fingeravtryck"
+#: 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\""
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listkatalogen %spartial saknas."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Listan över källor kunde inte läsas."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkivkatalogen %spartial saknas."
+msgid "Release '%s' for '%s' was not found"
+msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Kunde inte låsa katalogen %s"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Version \"%s\" för \"%s\" hittades inte"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Hämtar fil %li av %li (%s återstår)"
+msgid "Couldn't find task '%s'"
+msgstr "Kunde inte hitta funktionen \"%s\""
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
 
-#: 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/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/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Kunde inte ta status på %s."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
+"Kan inte välja installerad version eller kandidatversion från paketet \"%s\" "
+"eftersom det inte har någon av dem"
 
-# "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
+#: apt-pkg/cacheset.cc:647
 #, 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"
+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/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 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:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Kunde inte öppna filen \"%s\""
+"Kan inte välja kandidatversion från paketet %s eftersom det inte har någon "
+"kandidat"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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\"."
+"Kan inte välja installerad version från paketet %s eftersom det inte är "
+"installerat"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2505,54 +2702,86 @@ msgstr "Skriver ny källista\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Poster i källistan för denna skiva:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Kunde inte ta status på %s."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bygger beroendeträd"
 
-#: 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: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 "Failed to open StateFile %s"
+msgstr "Misslyckades med att öppna StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Misslyckades med att skriva temporär StateFile %s"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Kunde inte tolka paketfilen %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Kunde inte tolka paketfilen %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Skrev %i poster med %i saknade filer.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Skrev %i poster med %i filer som inte stämmer\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, 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"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Kan inte hitta autentiseringspost för: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash-kontrollsumman stämmer inte för: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2579,6 +2808,223 @@ msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ogiltig \"Date\"-post i Release-filen %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Paketsystemet \"%s\" stöds inte"
+
+#
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Kör dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Kunde inte öppna filen \"%s\""
+
+#: apt-pkg/packagemanager.cc:630
+#, 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\"."
+
+# Felmeddelande
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Paketcachen är tom"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Paketcachefilen är skadad"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "Paketcachefilens version är inkompatibel"
+
+#: 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: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:179
+msgid "The package cache was built for a different architecture"
+msgstr "Paketcachen byggdes för en annan arkitektur"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Beroende av"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Förberoende av"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Föreslår"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Rekommenderar"
+
+# "Konfliktar"?
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Står i konflikt med"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Ersätter"
+
+# "Föråldrar"?
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Föråldrar"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Gör sönder"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Utökar"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "viktigt"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "nödvändigt"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standard"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "valfri"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kunde inte ta status på källkodspaketlistan %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 "Läser paketlistor"
+
+# Bättre ord?
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samlar filtillhandahållningar"
+
+#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Indexfiler av typ \"%s\" stöds inte"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2654,243 +3100,144 @@ msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
 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/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:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version \"%s\" för \"%s\" hittades inte"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Kunde inte hitta funktionen \"%s\""
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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: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\""
+msgid "Unable to parse package file %s (1)"
+msgstr "Kunde inte tolka paketfilen %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Kunde inte tolka paketfilen %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Kan inte välja installerad version eller kandidatversion från paketet \"%s\" "
-"eftersom det inte har någon av dem"
+"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla "
+"använts istället."
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Leverantörsblocket %s saknar fingeravtryck"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Kunde inte ta status på monteringspunkten %s."
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Kunde inte ta status på cd-romen."
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "Installerar %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Kommandoradsflaggan \"%c\" [från %s] är inte känd."
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "Konfigurerar %s"
+msgid "Command line option %s is not understood"
+msgstr "Förstår inte kommandoradsflaggan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "Tar bort %s"
+msgid "Command line option %s is not boolean"
+msgstr "Kommandoradsflaggan %s är inte boolsk"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "Tar bort hela %s"
+msgid "Option %s requires an argument."
+msgstr "Flaggan %s kräver ett argument."
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Uppmärksammar försvinnandet av %s"
+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/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Kör efterinstallationsutlösare %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Flaggan %s kräver ett heltalsargument, inte \"%s\""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Katalogen \"%s\" saknas"
+msgid "Option '%s' is too long"
+msgstr "Flaggan \"%s\" är för lång"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Kunde inte öppna filen \"%s\""
+msgid "Sense %s is not understood, try true or false."
+msgstr "Förstår inte %s, prova med \"true\" eller \"false\"."
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "Förbereder %s"
+msgid "Invalid operation %s"
+msgstr "Felaktig åtgärd %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "Packar upp %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Okänd typförkortning: \"%c\""
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Förbereder konfigurering av %s"
+msgid "Opening configuration file %s"
+msgstr "Öppnar konfigurationsfilen %s"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "Installerade %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaxfel %s:%u: Block börjar utan namn."
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Förbereder borttagning av %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaxfel %s:%u: Felformat märke"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "Tog bort %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Förbereder borttagning av hela %s"
+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/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "Tog bort hela %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "beroendeproblem - lämnar okonfigurerad"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
-"diskutrymmet är slut"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
-"är slut"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
-"diskutrymmet är slut"
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-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"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaxfel %s:%u: Inkluderad härifrån"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, 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. "
+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/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Inte låst"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3005,54 +3352,11 @@ msgstr "Problem med att avlänka filen %s"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Valet %s hittades inte"
+msgid "No keyring installed in %s."
+msgstr "Ingen nyckelring installerad i %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3110,525 +3414,232 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nyckelring installerad i %s."
+msgid "%c%s... Error!"
+msgstr "%c%s... Fel!"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Kommandoradsflaggan \"%c\" [från %s] är inte känd."
+msgid "%c%s... Done"
+msgstr "%c%s... Färdig"
 
-#: 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/progress.cc:181
+msgid "..."
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:168
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Kommandoradsflaggan %s är inte boolsk"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Färdig"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Flaggan %s kräver ett argument."
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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>."
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Flaggan %s kräver ett heltalsargument, inte \"%s\""
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Flaggan \"%s\" är för lång"
+msgid "%lis"
+msgstr "%lis"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Förstår inte %s, prova med \"true\" eller \"false\"."
+msgid "Selection %s not found"
+msgstr "Valet %s hittades inte"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Listan över filtillägg för Packages är för lång"
+"Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Fel vid behandling av katalogen %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Listan över filtillägg för Sources är för lång"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Fel vid skrivning av rubrik till innehållsfil"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Fel vid behandling av innehållet %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Inga val träffades"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "NÃ¥gra filer saknas i paketfilsgruppen \"%s\""
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB var skadad, filen omdöpt till %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB är gammal, försöker uppgradera %s"
+"dpkg avbröts. Du måste köra \"%s\" manuellt för att korrigera problemet. "
 
-#: ftparchive/cachedb.cc:94
-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."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Inte låst"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Kunde inte öppna DB-filen %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Misslyckades med att läsa länken %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen styrpost"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Kunde inte få tag i någon markör"
+msgid "Installing %s"
+msgstr "Installerar %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "V: Kunde inte läsa katalogen %s\n"
+msgid "Configuring %s"
+msgstr "Konfigurerar %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, 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 "
+msgid "Removing %s"
+msgstr "Tar bort %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:98
 #, 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"
+msgid "Completely removing %s"
+msgstr "Tar bort hela %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "Misslyckades med att öppna %s"
+msgid "Noting disappearance of %s"
+msgstr "Uppmärksammar försvinnandet av %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Avlänka %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "Kör efterinstallationsutlösare %s"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Misslyckades med att läsa länken %s"
+msgid "Directory '%s' missing"
+msgstr "Katalogen \"%s\" saknas"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Misslyckades med att länka ut %s"
+msgid "Could not open file '%s'"
+msgstr "Kunde inte öppna filen \"%s\""
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Misslyckades med att länka %s till %s"
+msgid "Preparing %s"
+msgstr "Förbereder %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, 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:417
-msgid "Archive had no package field"
-msgstr "Arkivet har inget package-fält"
+msgid "Unpacking %s"
+msgstr "Packar upp %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen post i override-filen\n"
+msgid "Preparing to configure %s"
+msgstr "Förbereder konfigurering av %s"
 
-# parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  ansvarig för paketet %s är %s ej %s\n"
+msgid "Installed %s"
+msgstr "Installerade %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen källåsidosättningspost\n"
+msgid "Preparing for removal of %s"
+msgstr "Förbereder borttagning av %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har heller ingen binär åsidosättningspost\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Misslyckades med att allokera minne"
+msgid "Removed %s"
+msgstr "Tog bort %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "Förbereder borttagning av hela %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "Tog bort hela %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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\""
+msgid "Can not write log (%s)"
+msgstr "Kunde inte skriva till %s"
 
-# ???
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Misslyckades med att skapa FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Misslyckades med att grena process"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Barnprocess för komprimering"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Internt fel, misslyckades med att skapa %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "beroendeproblem - lämnar okonfigurerad"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "In/ut för underprocess/fil misslyckades"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är "
+"ett efterföljande fel från ett tidigare problem."
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Misslyckades med att läsa vid beräkning av MD5"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
+"diskutrymmet är slut"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem med att länka ut %s"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
+"är slut"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 #, 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 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!"
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
+"diskutrymmet är slut"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar ett in-/ut-"
+"fel för dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Internt fel, AllUpgrade förstörde något"
 
 #~ 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 e87209561..5d04c5cda 100644
--- a/po/th.po
+++ b/po/th.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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -97,74 +97,74 @@ msgstr "พื้นที่ที่นับรวมทั้งหมด: "
 msgid "Package file %s is out of sync."
 msgstr "ข้อมูล�ฟ้ม Package %s ไม่ตรง�ับความเป็นจริง"
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "คุณต้องระบุ�พตเทิร์นสำหรับค้นหาอย่างน้อยหนึ่ง�พตเทิร์น"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "คำสั่งนี้ไม่�นะนำให้ใช้�ล้ว �รุณาใช้ 'apt-mark showauto' �ทน"
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ไม่พบ�พ�เ�จ %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "�ฟ้ม�พ�เ�จ:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ข้อมูล�คชไม่ตรง�ับความเป็นจริง�ล้ว ไม่สามารถอ้างอิงไขว้ระหว่าง�ฟ้ม�พ�เ�จ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "�พ�เ�จที่ถู�ตรึง:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(ไม่พบ)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  ที่ติดตั้งอยู่: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  รุ่นที่ติดตั้งได้: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ไม่มี)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  �ารตรึง�พ�เ�จ: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  ตารางรุ่น:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -325,7 +325,7 @@ msgid "Couldn't find package %s"
 msgstr "ไม่พบ�พ�เ�จ %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "�ำหนด %s ให้เป็น�ารติดตั้ง�บบเลือ�เอง�ล้ว\n"
@@ -353,7 +353,7 @@ msgstr "ไม่สามารถล็อคไดเร�ทอรีดา
 msgid "Must specify at least one package to fetch source for"
 msgstr "ต้องระบุ�พ�เ�จอย่างน้อยหนึ่ง�พ�เ�จที่จะดาวน์โหลดซอร์สโค้ด"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ไม่พบ�พ�เ�จซอร์สโค้ดสำหรับ %s"
@@ -384,7 +384,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "จะข้าม�ฟ้ม '%s' ที่ดาวน์โหลดไว้�ล้ว\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
@@ -417,7 +417,7 @@ msgstr "ดาวน์โหลดซอร์ส %s\n"
 msgid "Failed to fetch some archives."
 msgstr "ไม่สามารถดาวน์โหลดบาง�ฟ้ม"
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "ดาวน์โหลดสำเร็จ�ล้ว �ละอยู่ในโหมดดาวน์โหลดอย่างเดียว"
 
@@ -426,30 +426,30 @@ msgstr "ดาวน์โหลดสำเร็จà¹�ล้ว à¹�ละอà¸
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "จะข้าม�าร�ต�ซอร์สของซอร์สที่�ต�ไว้�ล้วใน %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "คำสั่ง�ต��ฟ้ม '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "�รุณาตรวจสอบว่าได้ติดตั้ง�พ�เ�จ 'dpkg-dev' �ล้ว\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "คำสั่ง build '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "โพรเซสลู�ล้มเหลว"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ต้องระบุ�พ�เ�จอย่างน้อยหนึ่ง�พ�เ�จที่จะตรวจสอบสิ่งที่ต้อง�ารสำหรับ�าร build"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -457,17 +457,17 @@ msgid ""
 msgstr ""
 "ไม่มีข้อมูลสถาปัตย�รรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)"
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้อง�ารสำหรับ�าร build ของ %s"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ไม่ต้อง�ารสิ่งใดสำหรับ build\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -475,19 +475,19 @@ msgid ""
 msgstr ""
 "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s �ับ�พ�เ�จ '%s' ได้"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: �พ�เ�จ %s ที่ติดตั้งไว้ใหม่เ�ินไป"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,37 +496,37 @@ msgstr ""
 "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มี�พ�เ�จ %s "
 "รุ่นที่จะสอดคล้อง�ับความต้อง�ารรุ่นของ�พ�เ�จได้"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, 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:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับ�าร build ของ %s ได้"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับ�าร build ไม่สำเร็จ"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "ปูม�าร��้ไขสำหรับ %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "มอดูลที่รองรับ:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -613,15 +613,20 @@ msgstr ""
 "�ละ apt.conf(5)\n"
 "                       APT นี้มีพลังของ Super Cow\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 msgid "Must specify at least one pair url/filename"
 msgstr "ต้องระบุคู่ URL, ชื่อ�ฟ้ม อย่างน้อยหนึ่งคู่"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr "ดาวน์โหลดไม่สำเร็จ"
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
+#, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -630,6 +635,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -668,8 +674,9 @@ msgstr "%s ถู��ำหนดให้คงรุ่นอยู่�่
 msgid "%s was already not hold.\n"
 msgstr "%s ไม่ได้คงรุ่นอยู่�่อน�ล้ว\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "รอโพรเซส %s �ต่ตัวโพรเซสไม่อยู่"
@@ -900,7 +907,7 @@ msgstr "ไม่สามารถสร้างซ็อ�เ�็ต"
 msgid "Could not connect data socket, connection timed out"
 msgstr "ไม่สามารถเชื่อมต่อซ็อ�เ�็ตข้อมูล เนื่องจา�หมดเวลาคอย"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "ล้มเหลว"
 
@@ -946,7 +953,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อ�เ�
 msgid "Unable to accept connection"
 msgstr "ไม่สามารถรับ�ารเชื่อมต่อ"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "เ�ิดปั�หาขณะคำนวณค่า�ฮชของ�ฟ้ม"
 
@@ -1076,142 +1083,228 @@ msgstr "ลายเซ็นต่อไปนี้ไม่สามารถ
 msgid "Empty files can't be valid archives"
 msgstr "�ฟ้มว่างเปล่าไม่สามารถเป็น�ฟ้มจัดเ�็บที่ใช้�ารได้"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "เ�ิดข้อผิดพลาดขณะเขียนลง�ฟ้ม"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เ�ิดข้อผิดพลาดขณะอ่านข้อมูลจา�เซิร์ฟเวอร์ ปลายทางอี�ด้านหนึ่งปิด�ารเชื่อมต่อ"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "เ�ิดข้อผิดพลาดขณะอ่านข้อมูลจา�เซิร์ฟเวอร์"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "เ�ิดข้อผิดพลาดขณะเขียนลง�ฟ้ม"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "select ไม่สำเร็จ"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "เ�ิดข้อผิดพลาดขณะเขียนลง�ฟ้มผลลัพธ์"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "รอหัวข้อมูล"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถู�ต้อง"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถู�ต้อง"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถู�ต้อง"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "�ารสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "พบรูป�บบวันที่ที่ไม่รู้จั�"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "ข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "เจอ "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "ดึง:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "ข้าม "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "ปั�หา "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [�ำลังทำงาน]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"เปลี่ยน�ผ่น: �รุณาใส่�ผ่นชื่อ\n"
+" '%s'\n"
+"ลงในไดรว์ %s �ล้ว�ด enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr "�ำลังเรียงลำดับ"
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "*คำเตือน*: �พ�เ�จต่อไปนี้ไม่สามารถยืนยัน�หล่งต้นตอได้!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "จะข้าม�ารเตือนเ�ี่ยว�ับ�ารยืนยัน�หล่งต้นตอ\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "มีบาง�พ�เ�จไม่สามารถยืนยัน�หล่งต้นตอได้"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "จะติดตั้ง�พ�เ�จเหล่านี้โดยไม่ตรวจสอบหรือไม่?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "มีปั�หาบางประ�าร �ละมี�ารใช้ -y โดยไม่ระบุ --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "เ�ิดข้อผิดพลาดภายใน: มี�ารเรีย� InstallPackages ด้วย�พ�เ�จที่เสีย!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "มี�พ�เ�จที่จำเป็นต้องถอดถอน �ต่ถู�ห้าม�ารถอดถอนไว้"
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "ข้อผิดพลาดภายใน: �ารเรียงลำดับไม่เสร็จสิ้น"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "หลังจา��าร�ระทำนี้ เนื้อที่บนดิส�์จะว่างเพิ่มอี� %sB\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "มีปั�หาบางประ�าร �ละมี�ารใช้ -y โดยไม่ระบุ --force-yes"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1222,19 +1315,19 @@ msgstr ""
 "หา�ต้อง�ารดำเนิน�ารต่อ ให้พิมพ์ประโยค '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "เลิ�ทำ"
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "คุณต้อง�ารจะดำเนิน�ารต่อไปหรือไม่?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "ดาวน์โหลดบาง�ฟ้มไม่สำเร็จ"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1242,19 +1335,19 @@ msgstr ""
 "ดาวน์โหลดบาง�พ�เ�จไม่สำเร็จ บางที �ารเรีย� apt-get update หรือลองใช้ตัวเลือ� --fix-"
 "missing อาจช่วยได้"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "ยังไม่รองรับ --fix-missing พร้อม�ับ�ารเปลี่ยน�ผ่น"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "ไม่สามารถ��้ปั�หา�พ�เ�จที่ขาดหายได้"
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "จะล้มเลิ��ารติดตั้ง"
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1265,15 +1358,15 @@ msgstr[0] ""
 "�พ�เ�จต่อไปนี้ได้หายไปจา�ระบบของคุณ เพราะ�ฟ้มทั้งหมดได้ถู��ทนที่\n"
 "โดย�พ�เ�จอื่น�ล้ว:"
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "หมายเหตุ: นี่เป็นสิ่งที่ dpkg ทำโดยอัตโนมัติโดยเจตนา"
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "apt ถู��ำหนดไม่ให้มี�ารลบใดๆ จึงไม่สามารถดำเนิน�ารถอดถอนอัตโนมัติได้"
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1291,15 +1384,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "ข้อมูลต่อไปนี้อาจช่วย��้ปั�หาได้:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "เ�ิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1307,14 +1400,14 @@ msgid_plural ""
 "required:"
 msgstr[0] "�พ�เ�จต่อไปนี้ถู�ติดตั้ง�บบอัตโนมัติไว้ �ละไม่ต้องใช้อี�ต่อไป�ล้ว:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, 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:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอน�พ�เ�จดัง�ล่าวได้"
@@ -1331,7 +1424,7 @@ msgstr ""
 "มีปั�หาความขึ้นต่อ�ันระหว่าง�พ�เ�จ �รุณาลองใช้ 'apt-get -f install' โดยไม่ระบุ�พ�เ�จ "
 "(หรือจะระบุทาง��้�็ได้)"
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1342,201 +1435,185 @@ msgstr ""
 "หรือถ้าคุณ�ำลังใช้รุ่น unstable �็เป็นไปได้ว่า�พ�เ�จที่จำเป็นบางราย�าร\n"
 "ยังไม่ถู�สร้างขึ้น หรือถู�ย้ายออ�จา� Incoming"
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "�พ�เ�จมีปั�หา"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "จะติดตั้ง�พ�เ�จเพิ่มเติมต่อไปนี้:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "�พ�เ�จที่�นะนำ:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "�พ�เ�จที่ควรใช้ร่วม�ัน:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "จะข้าม %s เนื่องจา��พ�เ�จติดตั้งไว้�ล้ว �ละไม่มี�าร�ำหนดให้ปรับรุ่น\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "จะข้าม %s เนื่องจา��พ�เ�จไม่ได้ติดตั้งไว้ �ละคำสั่งมีเพียง�ารปรับรุ่นเท่านั้น\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจา�ไม่สามารถดาวน์โหลดได้\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่�ล้ว\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "เลือ�รุ่น '%s' (%s) สำหรับ '%s' �ล้ว\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "เลือ�รุ่น '%s' (%s) สำหรับ '%s' �ล้ว อันเนื่องมาจา� '%s'\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "�พ�เ�จ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มี�ารถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "�พ�เ�จ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มี�ารถอดถอน\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr "�ำลัง�สดงรายชื่อ"
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr "ไม่ทราบ"
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr "[ติดตั้งอยู่,สามารถปรับรุ่นเป็น: %s]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 msgid "[installed,local]"
 msgstr "[ติดตั้งอยู่,ในเครื่อง]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]"
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 msgid "[installed,automatic]"
 msgstr "[ติดตั้งอยู่,อัตโนมัติ]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 msgid "[installed]"
 msgstr "[ติดตั้งอยู่]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr "[สามารถปรับรุ่นจา�: %s]"
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr "[ค่าตั้งต�ค้าง]"
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "�พ�เ�จต่อไปนี้ขาด�พ�เ�จที่ต้องใช้:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "�ต่รุ่นที่ติดตั้งไว้คือ %s"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "�ต่รุ่นที่จะติดตั้งคือ %s"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "�ต่ไม่สามารถติดตั้งได้"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "�ต่�พ�เ�จนี้เป็น�พ�เ�จเสมือน"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "�ต่ได้ติดตั้งไว้"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "�ต่�พ�เ�จนี้จะไม่ถู�ติดตั้ง"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " หรือ"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "�พ�เ�จต่อไปนี้ขาด�พ�เ�จที่ต้องใช้:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "จะติดตั้ง�พ�เ�จ *ใหม่* ต่อไปนี้:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "จะ *ลบ* �พ�เ�จต่อไปนี้:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "จะคงรุ่น�พ�เ�จต่อไปนี้:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "จะปรับรุ่น�พ�เ�จต่อไปนี้ขึ้น:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "จะปรับรุ่น�พ�เ�จต่อไปนี้ *ลง*:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "จะเปลี่ยน�ปลงราย�ารคงรุ่น�พ�เ�จต่อไปนี้:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (เนื่องจา� %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1544,27 +1621,27 @@ msgstr ""
 "*คำเตือน*: �พ�เ�จที่จำเป็นต่อไปนี้จะถู�ถอดถอน\n"
 "คุณ *ไม่ควร* ทำเช่นนี้ นอ�จา�คุณเข้าใจสิ่งที่จะทำ!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "ติดตั้งซ้ำ %lu, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ปรับรุ่นลง %lu, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "ถอดถอน %lu �ละไม่ปรับรุ่น %lu\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
@@ -1573,7 +1650,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[Y/n]"
 
@@ -1581,35 +1658,28 @@ msgstr "[Y/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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "ค้นทั่วทั้งเนื้อความ"
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1622,39 +1692,6 @@ msgstr[0] "มีอีà¸� %i ระเบียน à¸�รุณาใช้ตà
 msgid "not a real package (virtual)"
 msgstr "ไม่ใช่�พ�เ�จจริง (เสมือน)"
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "*คำเตือน*: �พ�เ�จต่อไปนี้ไม่สามารถยืนยัน�หล่งต้นตอได้!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "จะข้าม�ารเตือนเ�ี่ยว�ับ�ารยืนยัน�หล่งต้นตอ\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "มีบาง�พ�เ�จไม่สามารถยืนยัน�หล่งต้นตอได้"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "จะติดตั้ง�พ�เ�จเหล่านี้โดยไม่ตรวจสอบหรือไม่?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1665,73 +1702,43 @@ msgstr "à¹�จง %s ไม่สำเร็จ จะà¹�à¸�้ไขอีà¸�à
 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/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "คำสั่ง update ไม่รับอาร์�ิวเมนต์เพิ่ม"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "เสร็จ�ล้ว"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "เจอ "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "ดึง:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "ข้าม "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "ปั�หา "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [�ำลังทำงาน]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"เปลี่ยน�ผ่น: �รุณาใส่�ผ่นชื่อ\n"
-" '%s'\n"
-"ลงในไดรว์ %s �ล้ว�ด enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "ไม่สามารถอ่าน %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1803,36 +1810,422 @@ msgstr "à¸�รุณาà¹�à¸�้ปัà¸�หาเหล่านั้น à¹�à¸
 msgid "Merging available information"
 msgstr "�ำลังผสานรายชื่อของ�พ�เ�จที่มี"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode ถู�เรีย�ใช้�ับโหนดที่ยังลิง�์อยู่"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "หาสมาชิ�ในตาราง�ฮชไม่สำเร็จ!"
+#: cmdline/apt-extracttemplates.cc:254
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "ไม่สามารถ mkstemp %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "จองเนื้อที่สำหรับ�ารเบน�ฟ้มไม่สำเร็จ"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "ไม่สามารถเขียนลง�ฟ้ม %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "ข้อผิดพลาดภายในที่ AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "รายชื่อนามส�ุล�พ�เ�จยาวเ�ินไป"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "พยายามเขียนทับ�ารเบน�ฟ้ม: %s -> %s �ับ %s/%s"
+msgid "Error processing directory %s"
+msgstr "เ�ิดข้อผิดพลาดขณะประมวลผลไดเร�ทอรี %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "รายชื่อนามส�ุลซอร์สยาวเ�ินไป"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "เ�ิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงใน�ฟ้มสารบั�"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "เพิ่ม�ารเบน�ฟ้ม %s -> %s ซ้ำสอง"
+msgid "Error processing contents %s"
+msgstr "เ�ิดข้อผิดพลาดขณะประมวลผลสารบั� %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "ไม่มีราย�ารเลือ�ที่ตรง"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "�ฟ้มค่าตั้ง %s/%s ซ้ำ"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "บาง�ฟ้มขาดหายไปใน�ลุ่ม�ฟ้ม�พ�เ�จ `%s'"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB เสีย จะเปลี่ยนชื่อ�ฟ้มเป็น %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB เป็นรุ่นเ�่า จะพยายามปรับรุ่น %s ขึ้น"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "ไม่สามารถเปิด�ฟ้ม DB %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "stat %s ไม่สำเร็จ"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "readlink %s ไม่สำเร็จ"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "�พ�เ�จไม่มีระเบียนควบคุม"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "�พ�เ�จไม่มีช่องข้อมูล 'Package'"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s ไม่มีข้อมูล override\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  ผู้ดู�ล %s คือ %s ไม่ใช่ %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s ไม่มีข้อมูล override สำหรับไบนารีเช่น�ัน\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1858,17 +2251,6 @@ msgstr "�พ�เ�จนี้พยายามเขียนลงปล
 msgid "The diversion path is too long"
 msgstr "พาธของ�ารเบน�ฟ้มยาวเ�ินไป"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, c-format
-msgid "Failed to stat %s"
-msgstr "stat %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"
@@ -1897,30 +2279,36 @@ msgstr "à¹�ฟ้ม %s/%s เขียนทับà¹�ฟ้มในà¹�พà¸�à¹
 msgid "Unable to stat %s"
 msgstr "ไม่สามารถ stat %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode ถู�เรีย�ใช้�ับโหนดที่ยังลิง�์อยู่"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "ไม่สามารถปิด�ฟ้ม %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "หาสมาชิ�ในตาราง�ฮชไม่สำเร็จ!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "จองเนื้อที่สำหรับ�ารเบน�ฟ้มไม่สำเร็จ"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "ข้อผิดพลาดภายในที่ AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "�ฟ้มนี้ไม่ใช่�พ�เ�จ DEB ที่ใช้�ารได้ ขาดสมาชิ� '%s'"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "พยายามเขียนทับ�ารเบน�ฟ้ม: %s -> %s �ับ %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิ� %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "เพิ่ม�ารเบน�ฟ้ม %s -> %s ซ้ำสอง"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "ไม่สามารถ�จง�ฟ้มควบคุมได้"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "�ฟ้มค่าตั้ง %s/%s ซ้ำ"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1968,197 +2356,52 @@ msgstr "checksum ของ�ฟ้ม tar ผิดพลาด �ฟ้มจ
 msgid "Unknown TAR header type %u, member %s"
 msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จั� ที่สมาชิ� %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr "ความคืบหน้า: [%3i%%]"
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "�ำลังเรีย� dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "ไม่รองรับระบบ�พ�เ�จ '%s'"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "ไม่สามารถระบุชนิดของระบบ�พ�เ�จที่เหมาะสมได้"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "เขียน�ล้ว %i ระเบียน\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "เขียน�ล้ว %i ระเบียน โดยมี�ฟ้มขาดหาย %i �ฟ้ม\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "เขียน�ล้ว %i ระเบียน โดยมี�ฟ้มผิดขนาด %i �ฟ้ม\n"
-
-#: 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 "เขียน�ล้ว %i ระเบียน โดยมี�ฟ้มขาดหาย %i �ฟ้ม �ละ�ฟ้มผิดขนาด %i �ฟ้ม\n"
-
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "ไม่พบระเบียนยืนยันความ�ท้สำหรับ: %s"
-
-#: apt-pkg/indexcopy.cc:521
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "�ฮชไม่ตรง�ันสำหรับ: %s"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "ไม่สามารถ�จงหรือเปิดรายชื่อ�พ�เ�จหรือสถานะ�พ�เ�จได้"
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "คุณอาจเรีย� `apt-get update' เพื่อ��้ปั�หาเหล่านี้ได้"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "ไม่สามารถอ่านรายชื่อ�หล่ง�พ�เ�จได้"
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "�คชของ�พ�เ�จว่างเปล่า"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "�ฟ้ม�คชของ�พ�เ�จเสียหาย"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "�ฟ้ม�คชของ�พ�เ�จเป็นคนละรุ่น�ัน"
-
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "�ฟ้ม�คชของ�พ�เ�จเสียหาย �ฟ้มมีขนาดเล็��ว่าที่ควรจะเป็น"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "�ฟ้มนี้ไม่ใช่�พ�เ�จ DEB ที่ใช้�ารได้ ขาดสมาชิ� '%s'"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่น�บบ '%s'"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "�คชของ�พ�เ�จถู�สร้างมาสำหรับสถาปัตย�รรมอื่น"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "ต้องใช้"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "ต้องใช้ขณะติดตั้ง"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "�นะนำ"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "ควรใช้ร่วม�ับ"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "ขัด�ย้ง�ับ"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "�ทนที่"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "ใช้�ทน"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "ทำให้พัง"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "เพิ่มความสามารถ"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "สำคั�"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "จำเป็น"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "มาตร�าน"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "ตัวเลือ�"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "ส่วนเสริม"
+msgid "Internal error, could not locate member %s"
+msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิ� %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ไม่พบไดรเวอร์สำหรับวิธี�าร %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "ไม่สามารถ�จง�ฟ้มควบคุมได้"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "ได้ติดตั้ง�พ�เ�จ %s ไว้หรือไม่?"
+msgid "List directory %spartial is missing."
+msgstr "ไม่มีไดเร�ทอรีรายชื่อ�พ�เ�จ %spartial"
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "ไม่สามารถเรีย�ทำงานวิธี�าร %s"
+msgid "Archives directory %spartial is missing."
+msgstr "ไม่มีไดเร�ทอรี�พ�เ�จ %spartial"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "�รุณาใส่�ผ่นชื่อ: '%s' ลงในไดรว์ '%s' �ล้ว�ด enter"
+msgid "Unable to lock directory %s"
+msgstr "ไม่สามารถล็อคไดเร�ทอรี %s"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "ไม่รองรับ�ฟ้มดัชนีชนิด '%s'"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "ไม่สามารถเปิด�ฟ้มสถานะ %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "�ำลังดาวน์โหลด�ฟ้มที่ %li จา� %li (เหลืออี� %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "ไม่สามารถเขียน�ฟ้มสถานะชั่วคราว %s"
+msgid "Retrieving file %li of %li"
+msgstr "�ำลังดาวน์โหลด�ฟ้มที่ %li จา� %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2177,7 +2420,7 @@ msgstr "ขนาดไม่ตรง�ัน"
 msgid "Invalid file format"
 msgstr "รูป�บบของ�ฟ้มไม่ถู�ต้อง"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2186,16 +2429,16 @@ msgstr ""
 "ไม่พบราย�าร '%s' ที่ต้อง�ารใน�ฟ้ม Release (ราย�าร sources.list ไม่ถู�ต้อง "
 "หรือ�ฟ้มผิดรูป�บบ)"
 
-#: apt-pkg/acquire-item.cc:1597
+#: apt-pkg/acquire-item.cc:1589
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "ไม่พบผลรวม�ฮชสำหรับ '%s' ใน�ฟ้ม Release"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "ไม่มี�ุ��จสาธารณะสำหรับ�ุ��จหมายเลขต่อไปนี้:\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2204,12 +2447,12 @@ msgstr ""
 "�ฟ้ม Release สำหรับ %s หมดอายุ�ล้ว (ตั้ง�ต่ %s ที่�ล้ว) จะไม่ใช้ราย�ารปรับรุ่นต่างๆ "
 "ของคลัง�พ�เ�จนี้"
 
-#: apt-pkg/acquire-item.cc:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "ชุดจัด�จ�ขัด�ย้ง�ัน: %s (ต้อง�าร %s �ต่พบ %s)"
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2219,185 +2462,131 @@ msgstr ""
 "ข้อผิดพลาดจา� GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "ข้อผิดพลาดจา� GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "ไม่พบ�หล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "�ฟ้มดัชนี�พ�เ�จเสียหาย ไม่มีข้อมูล Filename: (ชื่อ�ฟ้ม) สำหรับ�พ�เ�จ %s"
 
-#: 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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "เ�ิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
-
-#: 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:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำ�ัดจำนวนรุ่น�พ�เ�จที่ APT สามารถรองรับได้�ล้ว"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำ�ัดจำนวนคำบรรยาย�พ�เ�จที่ APT สามารถรองรับได้�ล้ว"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำ�ัดจำนวนความสัมพันธ์ระหว่าง�พ�เ�จที่ APT สามารถรองรับได้�ล้ว"
+msgid "The method driver %s could not be found."
+msgstr "ไม่พบไดรเวอร์สำหรับวิธี�าร %s"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ไม่พบ�พ�เ�จ %s %s ขณะประมวลผลความขึ้นต่อ�ฟ้ม"
+msgid "Is the package %s installed?"
+msgstr "ได้ติดตั้ง�พ�เ�จ %s ไว้หรือไม่?"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ไม่สามารถ 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 "�ำลังอ่านรายชื่อ�พ�เ�จ"
+msgid "Method %s did not start correctly"
+msgstr "ไม่สามารถเรีย�ทำงานวิธี�าร %s"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "�ำลังเ�็บข้อมูล�ฟ้มที่ตระเตรียมให้"
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "�รุณาใส่�ผ่นชื่อ: '%s' ลงในไดรว์ '%s' �ล้ว�ด enter"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Unable to write to %s"
-msgstr "ไม่สามารถเขียนลง�ฟ้ม %s"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "จำเป็นต้องติดตั้ง�พ�เ�จ %s ซ้ำ �ต่หาตัว�พ�เ�จไม่พบ"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "เ�ิดข้อผิดพลาด IO ขณะบันทึ��คชของซอร์ส"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เ�ิด�พ�เ�จเสีย "
+"อาจเ�ิดจา��พ�เ�จที่ถู��ำหนดให้คงรุ่นไว้"
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "ไม่สามารถ��้ปั�หาได้ คุณได้คงรุ่น�พ�เ�จที่เสียอยู่ไว้"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "ไม่มีไดเร�ทอรีรายชื่อ�พ�เ�จ %spartial"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "ไม่สามารถ�จงหรือเปิดรายชื่อ�พ�เ�จหรือสถานะ�พ�เ�จได้"
 
-#: apt-pkg/acquire.cc:91
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "ไม่มีไดเร�ทอรี�พ�เ�จ %spartial"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "คุณอาจเรีย� `apt-get update' เพื่อ��้ปั�หาเหล่านี้ได้"
 
-#: apt-pkg/acquire.cc:99
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "ไม่สามารถล็อคไดเร�ทอรี %s"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "ไม่สามารถอ่านรายชื่อ�หล่ง�พ�เ�จได้"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "�ำลังดาวน์โหลด�ฟ้มที่ %li จา� %li (เหลืออี� %s)"
+msgid "Release '%s' for '%s' was not found"
+msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:492
 #, c-format
-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 ของคุณด้วย"
+msgid "Version '%s' for '%s' was not found"
+msgstr "ไม่พบรุ่น '%s' ของ '%s'"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Unable to stat %s."
-msgstr "ไม่สามารถ stat %s"
+msgid "Couldn't find task '%s'"
+msgstr "ไม่พบงานติดตั้ง '%s'"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:609
 #, 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 ได้ เนื่องจา�รุ่นดัง�ล่าวไม่มีใน�หล่ง"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "ไม่พบ�พ�เ�จที่ตรง�ับนิพจน์เร�ิวลาร์ '%s'"
 
-#: apt-pkg/policy.cc:422
+#: apt-pkg/cacheset.cc:615
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "ระเบียนผิดรูป�บบใน�ฟ้มค่าปรับ�ต่ง %s: ไม่มีข้อมูลส่วนหัว 'Package'"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "ไม่พบ�พ�เ�จที่ตรง�ับ glob '%s'"
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:626
 #, 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 "ไม่ได้ระบุลำดับความสำคั� (หรือค่าศูนย์) สำหรับ�ารตรึง"
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "ไม่สามารถเลือ�รุ่นต่างๆ ของ�พ�เ�จ '%s' ได้ เนื่องจา�เป็น�พ�เ�จเสมือนอย่าง�ท้จริง"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
-"ไม่สามารถตั้งค่า '%s' �บบทันทีได้ �รุณาอ่านรายละเอียดเพิ่มเติมจา� man 5 apt.conf ที่หัวข้อ "
-"APT::Immediate-Configure (%d)"
+"ไม่สามารถเลือ�รุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของ�พ�เ�จ '%s' ได้ เนื่องจา�ไม่มีทั้งสองอย่าง"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "ไม่สามารถตั้งค่า '%s'"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "ไม่สามารถเลือ�รุ่นใหม่ที่สุดของ�พ�เ�จ '%s' ได้ เนื่องจา�เป็น�พ�เ�จเสมือนอย่าง�ท้จริง"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:655
 #, 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"
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "ไม่สามารถเลือ�รุ่นสำหรับติดตั้งของ�พ�เ�จ '%s' ได้ เนื่องจา�ไม่มีรุ่นสำหรับติดตั้ง"
+
+#: 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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2479,53 +2668,86 @@ msgstr "�ำลังเขียนรายชื่อ�หล่ง�พ
 msgid "Source list entries for this disc are:\n"
 msgstr "บรรทัดรายชื่อ�หล่ง�พ�เ�จสำหรับ�ผ่นนี้คือ:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "จำเป็นต้องติดตั้ง�พ�เ�จ %s ซ้ำ �ต่หาตัว�พ�เ�จไม่พบ"
+msgid "Unable to stat %s."
+msgstr "ไม่สามารถ stat %s"
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เ�ิด�พ�เ�จเสีย "
-"อาจเ�ิดจา��พ�เ�จที่ถู��ำหนดให้คงรุ่นไว้"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "�ำลังสร้างโครงสร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "ไม่สามารถ��้ปั�หาได้ คุณได้คงรุ่น�พ�เ�จที่เสียอยู่ไว้"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "รุ่น�พ�เ�จที่มี"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "ไม่สามารถเปิด�ฟ้มสถานะ %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "ไม่สามารถเขียน�ฟ้มสถานะชั่วคราว %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "ส่งสภาว�ารณ์ไปยัง�ลไ��าร��้ปั�หา"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "ส่งคำสั่งไปยัง�ลไ��าร��้ปั�หา"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "เตรียมรับคำตอบ"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr "�ลไ��าร��้ปั�หาภายนอ�ทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "เรีย��ลไ��าร��้ปั�หาภายนอ�"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "ไม่สามารถ�จง�ฟ้ม�พ�เ�จ %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "เขียน�ล้ว %i ระเบียน\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "ไม่สามารถ�จง�ฟ้ม�พ�เ�จ %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "เขียน�ล้ว %i ระเบียน โดยมี�ฟ้มขาดหาย %i �ฟ้ม\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "เขียน�ล้ว %i ระเบียน โดยมี�ฟ้มผิดขนาด %i �ฟ้ม\n"
+
+#: 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 "เขียน�ล้ว %i ระเบียน โดยมี�ฟ้มขาดหาย %i �ฟ้ม �ละ�ฟ้มผิดขนาด %i �ฟ้ม\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "ไม่พบระเบียนยืนยันความ�ท้สำหรับ: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "�ฮชไม่ตรง�ันสำหรับ: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2552,6 +2774,215 @@ msgstr "ราย�าร 'Valid-Until' ไม่ถู�ต้องใน�
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "ราย�าร 'Date' ไม่ถู�ต้องใน�ฟ้ม Release %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "ไม่รองรับระบบ�พ�เ�จ '%s'"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "ไม่สามารถระบุชนิดของระบบ�พ�เ�จที่เหมาะสมได้"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr "ความคืบหน้า: [%3i%%]"
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "�ำลังเรีย� dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "ไม่สามารถตั้งค่า '%s'"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "�คชของ�พ�เ�จว่างเปล่า"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "�ฟ้ม�คชของ�พ�เ�จเสียหาย"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "�ฟ้ม�คชของ�พ�เ�จเป็นคนละรุ่น�ัน"
+
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr "�ฟ้ม�คชของ�พ�เ�จเสียหาย �ฟ้มมีขนาดเล็��ว่าที่ควรจะเป็น"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่น�บบ '%s'"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "�คชของ�พ�เ�จถู�สร้างมาสำหรับสถาปัตย�รรมอื่น"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "ต้องใช้"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "ต้องใช้ขณะติดตั้ง"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "�นะนำ"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "ควรใช้ร่วม�ับ"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "ขัด�ย้ง�ับ"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "�ทนที่"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "ใช้�ทน"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "ทำให้พัง"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "เพิ่มความสามารถ"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "สำคั�"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "จำเป็น"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "มาตร�าน"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "ตัวเลือ�"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "ส่วนเสริม"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำ�ัดจำนวนชื่อ�พ�เ�จที่ APT สามารถรองรับได้�ล้ว"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำ�ัดจำนวนรุ่น�พ�เ�จที่ APT สามารถรองรับได้�ล้ว"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำ�ัดจำนวนคำบรรยาย�พ�เ�จที่ APT สามารถรองรับได้�ล้ว"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำ�ัดจำนวนความสัมพันธ์ระหว่าง�พ�เ�จที่ APT สามารถรองรับได้�ล้ว"
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ไม่สามารถ 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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "เ�ิดข้อผิดพลาด IO ขณะบันทึ��คชของซอร์ส"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "ไม่รองรับ�ฟ้มดัชนีชนิด '%s'"
+
+#: 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/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2627,225 +3058,140 @@ msgstr "ไม่รู้จั�ชนิด '%s' ที่บรรทัด
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "ไม่รู้จั�ชนิด '%s' ที่วรรคที่ %u ใน�ฟ้มรายชื่อ�หล่ง�พ�เ�จ %s"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "ไม่พบรุ่น '%s' ของ '%s'"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "ไม่พบงานติดตั้ง '%s'"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "ไม่พบ�พ�เ�จที่ตรง�ับนิพจน์เร�ิวลาร์ '%s'"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "ไม่พบ�พ�เ�จที่ตรง�ับ glob '%s'"
+msgid "Unable to parse package file %s (1)"
+msgstr "ไม่สามารถ�จง�ฟ้ม�พ�เ�จ %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "ไม่สามารถเลือ�รุ่นต่างๆ ของ�พ�เ�จ '%s' ได้ เนื่องจา�เป็น�พ�เ�จเสมือนอย่าง�ท้จริง"
+msgid "Unable to parse package file %s (2)"
+msgstr "ไม่สามารถ�จง�ฟ้ม�พ�เ�จ %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"ไม่สามารถเลือ�รุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของ�พ�เ�จ '%s' ได้ เนื่องจา�ไม่มีทั้งสองอย่าง"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "ดาวน์โหลด�ฟ้มดัชนีบาง�ฟ้มไม่สำเร็จ จะข้ามราย�ารดัง�ล่าวไป หรือใช้ข้อมูลเ�่า�ทน"
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "ไม่สามารถเลือ�รุ่นใหม่ที่สุดของ�พ�เ�จ '%s' ได้ เนื่องจา�เป็น�พ�เ�จเสมือนอย่าง�ท้จริง"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "ไม่สามารถเลือ�รุ่นสำหรับติดตั้งของ�พ�เ�จ '%s' ได้ เนื่องจา�ไม่มีรุ่นสำหรับติดตั้ง"
+msgid "Unable to stat the mount point %s"
+msgstr "ไม่สามารถ stat จุดเมานท์ %s"
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "ไม่สามารถ stat ซีดีรอม"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "�ำลังติดตั้ง %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "ไม่รู้จั�ตัวเลือ�บรรทัดคำสั่ง '%c' [จา� %s]"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "�ำลังตั้งค่า %s"
+msgid "Command line option %s is not understood"
+msgstr "ไม่เข้าใจตัวเลือ�บรรทัดคำสั่ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "�ำลังถอดถอน %s"
+msgid "Command line option %s is not boolean"
+msgstr "ตัวเลือ�บรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "�ำลังถอดถอน %s อย่างสมบูรณ์"
+msgid "Option %s requires an argument."
+msgstr "ตัวเลือ� %s ต้องมีอาร์�ิวเมนต์"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "�ำลังจดบันทึ��ารหายไปของ %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "ตัวเลือ� %s: �าร�ำหนดราย�ารค่าตั้งต้องมี =<val>"
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "�ำลังเรีย��ารสะ�ิด %s หลัง�ารติดตั้ง"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "ตัวเลือ� %s ต้อง�ารอาร์�ิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "ไม่มีไดเร�ทอรี '%s'"
+msgid "Option '%s' is too long"
+msgstr "ตัวเลือ� '%s' ยาวเ�ินไป"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "ไม่สามารถเปิด�ฟ้ม '%s'"
+msgid "Sense %s is not understood, try true or false."
+msgstr "ไม่เข้าใจค่าบูลีน %s �รุณาลองใช้ true หรือ false"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "�ำลังเตรียม %s"
+msgid "Invalid operation %s"
+msgstr "ไม่รู้จั�คำสั่ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "�ำลัง�ต��พ�เ�จ %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จั�: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "�ำลังเตรียมตั้งค่า %s"
+msgid "Opening configuration file %s"
+msgstr "ขณะเปิด�ฟ้มค่าตั้ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "ติดตั้ง %s �ล้ว"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "ไวยา�รณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "�ำลังเตรียมถอดถอน %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "ไวยา�รณ์ผิดพลาด %s:%u: �ท็�ผิดรูป�บบ"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "ถอดถอน %s �ล้ว"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "ไวยา�รณ์ผิดพลาด %s:%u: มีขยะเ�ินหลังค่า"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "�ำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "ไวยา�รณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "ถอดถอน %s อย่างสมบูรณ์�ล้ว"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr "ioctl(TIOCGWINSZ) ล้มเหลว"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "ไวยา�รณ์ผิดพลาด %s:%u: ใช้ include ซ้อน�ันมา�เ�ินไป"
 
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid "Can not write log (%s)"
-msgstr "ไม่สามารถเขียนปูม (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1069
-msgid "Is /dev/pts mounted?"
-msgstr "ได้เมานท์ /dev/pts ไว้หรือไม่?"
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr "stdout เป็นเทอร์มินัลหรือไม่?"
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "ป�ิบัติ�ารถู�ขัดจังหวะ�่อนที่จะสามารถทำงานเสร็จ"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "มีปั�หาความขึ้นต่อ�ัน - จะทิ้งไว้โดยไม่ตั้งค่า"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr "ไม่มี�ารเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเ�ิดจา�ดิส�์เต็ม"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr "ไม่มี�ารเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเ�ิดจา�หน่วยความจำเต็ม"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"ไม่มี�ารเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเ�ิดจา�ปั�หาของระบบในเครื่อง"
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"ไม่มี�ารเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเ�ิดจา�ปั�หา�ารอ่าน/เขียนของ dpkg"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "ไวยา�รณ์ผิดพลาด %s:%u: include จา�ที่นี่"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "ไม่สามารถล็อคไดเร�ทอรีดู�ลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "ไวยา�รณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "ไม่สามารถล็อคไดเร�ทอรีดู�ลระบบ (%s) คุณเป็น root หรือเปล่า?"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "ไวยา�รณ์ผิดพลาด %s:%u: directive 'clear' ต้องมีอาร์�ิวเมนต์เป็นลำดับชั้นตัวเลือ�"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg ถู�ขัดจังหวะ คุณต้องเรีย� '%s' เองเพื่อ��้ปั�หา"
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "ไม่ได้ล็อคอยู่"
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "ไวยา�รณ์ผิดพลาด %s:%u: มีขยะเ�ินหลังจบ�ฟ้ม"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2960,54 +3306,11 @@ msgstr "เ�ิดปั�หาขณะลบ�ฟ้ม %s"
 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%%"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "ไม่พบราย�ารเลือ� %s"
+msgid "No keyring installed in %s."
+msgstr "ไม่มีพวง�ุ��จติดตั้งไว้ใน %s"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3061,512 +3364,224 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "ตัวเลือ�บรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน"
+msgid "%c%s... Error!"
+msgstr "%c%s... ผิดพลาด!"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "ตัวเลือ� %s ต้องมีอาร์�ิวเมนต์"
+msgid "%c%s... Done"
+msgstr "%c%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/progress.cc:181
+msgid "..."
+msgstr "..."
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "ตัวเลือ� %s ต้อง�ารอาร์�ิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'"
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "ตัวเลือ� '%s' ยาวเ�ินไป"
+msgid "%lid %lih %limin %lis"
+msgstr "%liวัน %liชม. %liนาที %liวิ"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "ไม่เข้าใจค่าบูลีน %s �รุณาลองใช้ true หรือ false"
+msgid "%lih %limin %lis"
+msgstr "%liชม. %liนาที %liวิ"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, 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"
+msgid "%limin %lis"
+msgstr "%liนาที %liวิ"
 
-#: cmdline/apt-extracttemplates.cc:254
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "รายชื่อนามส�ุล�พ�เ�จยาวเ�ินไป"
+msgid "%lis"
+msgstr "%liวิ"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Error processing directory %s"
-msgstr "เ�ิดข้อผิดพลาดขณะประมวลผลไดเร�ทอรี %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "รายชื่อนามส�ุลซอร์สยาวเ�ินไป"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "เ�ิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงใน�ฟ้มสารบั�"
+msgid "Selection %s not found"
+msgstr "ไม่พบราย�ารเลือ� %s"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Error processing contents %s"
-msgstr "เ�ิดข้อผิดพลาดขณะประมวลผลสารบั� %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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:841
-msgid "No selections matched"
-msgstr "ไม่มีราย�ารเลือ�ที่ตรง"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "บาง�ฟ้มขาดหายไปใน�ลุ่ม�ฟ้ม�พ�เ�จ `%s'"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "ไม่สามารถล็อคไดเร�ทอรีดู�ลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?"
 
-#: ftparchive/cachedb.cc:65
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB เสีย จะเปลี่ยนชื่อ�ฟ้มเป็น %s.old"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "ไม่สามารถล็อคไดเร�ทอรีดู�ลระบบ (%s) คุณเป็น root หรือเปล่า?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB เป็นรุ่นเ�่า จะพยายามปรับรุ่น %s ขึ้น"
-
-#: ftparchive/cachedb.cc:94
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "ไม่สามารถเปิด�ฟ้ม DB %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink %s ไม่สำเร็จ"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "�พ�เ�จไม่มีระเบียนควบคุม"
-
-#: ftparchive/cachedb.cc:594
-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 ไม่สำเร็จ"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg ถู�ขัดจังหวะ คุณต้องเรีย� '%s' เองเพื่อ��้ปั�หา"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "ไม่ได้ล็อคอยู่"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "เปิด %s ไม่สำเร็จ"
+msgid "Installing %s"
+msgstr "�ำลังติดตั้ง %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Configuring %s"
+msgstr "�ำลังตั้งค่า %s"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink %s ไม่สำเร็จ"
+msgid "Removing %s"
+msgstr "�ำลังถอดถอน %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "unlink %s ไม่สำเร็จ"
+msgid "Completely removing %s"
+msgstr "�ำลังถอดถอน %s อย่างสมบูรณ์"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** ลิง�์ %s ไปยัง %s ไม่สำเร็จ"
+msgid "Noting disappearance of %s"
+msgstr "�ำลังจดบันทึ��ารหายไปของ %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " มาถึงขีดจำ�ัด�าร DeLink ที่ %sB �ล้ว\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "�พ�เ�จไม่มีช่องข้อมูล 'Package'"
+msgid "Running post-installation trigger %s"
+msgstr "�ำลังเรีย��ารสะ�ิด %s หลัง�ารติดตั้ง"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s ไม่มีข้อมูล override\n"
+msgid "Directory '%s' missing"
+msgstr "ไม่มีไดเร�ทอรี '%s'"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  ผู้ดู�ล %s คือ %s ไม่ใช่ %s\n"
+msgid "Could not open file '%s'"
+msgstr "ไม่สามารถเปิด�ฟ้ม '%s'"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
+msgid "Preparing %s"
+msgstr "�ำลังเตรียม %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ไม่มีข้อมูล override สำหรับไบนารีเช่น�ัน\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - จองหน่วยความจำไม่สำเร็จ"
+msgid "Unpacking %s"
+msgstr "�ำลัง�ต��พ�เ�จ %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "Unable to open %s"
-msgstr "ไม่สามารถเปิด %s"
+msgid "Preparing to configure %s"
+msgstr "�ำลังเตรียมตั้งค่า %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "�ฟ้ม override %s ผิดรูป�บบที่บรรทัด %llu (%s)"
+msgid "Installed %s"
+msgstr "ติดตั้ง %s �ล้ว"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "ไม่สามารถอ่าน�ฟ้ม override %s"
+msgid "Preparing for removal of %s"
+msgstr "�ำลังเตรียมถอดถอน %s"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "�ฟ้ม override %s ผิดรูป�บบที่บรรทัด %llu #1"
+msgid "Removed %s"
+msgstr "ถอดถอน %s �ล้ว"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "�ฟ้ม override %s ผิดรูป�บบที่บรรทัด %llu #2"
+msgid "Preparing to completely remove %s"
+msgstr "�ำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "�ฟ้ม override %s ผิดรูป�บบที่บรรทัด %llu #3"
+msgid "Completely removed %s"
+msgstr "ถอดถอน %s อย่างสมบูรณ์�ล้ว"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "ไม่รู้จั�อัล�อริทึมบีบอัด '%s'"
+msgid "Can not write log (%s)"
+msgstr "ไม่สามารถเขียนปูม (%s)"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "ผลลัพธ์ของ�ารบีบอัด %s ต้องมีชุดของ�ารบีบอัดด้วย"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr "ได้เมานท์ /dev/pts ไว้หรือไม่?"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "สร้าง FILE* ไม่สำเร็จ"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr "stdout เป็นเทอร์มินัลหรือไม่?"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork ไม่สำเร็จ"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "ป�ิบัติ�ารถู�ขัดจังหวะ�่อนที่จะสามารถทำงานเสร็จ"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "โพรเซสลู�สำหรับบีบอัด"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "ไม่มี�ารเขียนรายงาน apport เพราะถึงขีดจำ�ัด MaxReports �ล้ว"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "มีปั�หาความขึ้นต่อ�ัน - จะทิ้งไว้โดยไม่ตั้งค่า"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO ไปยังโพรเซสย่อยหรือ�ฟ้มล้มเหลว"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"ไม่มี�ารเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจา�ข้อผิดพลาด�่อนหน้า"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "อ่าน�ฟ้มไม่สำเร็จขณะคำนวณ MD5"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr "ไม่มี�ารเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเ�ิดจา�ดิส�์เต็ม"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "มีปั�หาขณะลบ�ฟ้ม %s"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr "ไม่มี�ารเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเ�ิดจา�หน่วยความจำเต็ม"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 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"
+"No apport report written because the error message indicates an issue on the "
+"local system"
 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 "พบระเบียน�พ�เ�จที่ไม่รู้จั�!"
+"ไม่มี�ารเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเ�ิดจา�ปั�หาของระบบในเครื่อง"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"ไม่มี�ารเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเ�ิดจา�ปั�หา�ารอ่าน/เขียนของ dpkg"
+
+#~ msgid "ioctl(TIOCGWINSZ) failed"
+#~ msgstr "ioctl(TIOCGWINSZ) ล้มเหลว"
+
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "เ�ิดข้อผิดพลาดภายใน: �ารปรับรุ่นทำความเสียหาย"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ไม่ใช่�พ�เ�จ DEB ที่ใช้�ารได้"
diff --git a/po/tl.po b/po/tl.po
index 5735cc957..49a96a24e 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -102,75 +102,75 @@ msgstr "Kabuuan ng puwang na napag-tuosan: "
 msgid "Package file %s is out of sync."
 msgstr "Wala sa sync ang talaksan ng paketeng %s."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Talaksang Pakete:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Mga naka-Pin na Pakete:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(hindi nahanap)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Nakaluklok: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Kandidato: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(wala)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Naka-Pin na Pakete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Talaang Bersyon:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -335,7 +335,7 @@ msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
@@ -363,7 +363,7 @@ msgstr "Hindi maaldaba ang directory ng download"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Hindi mahanap ang paketeng source para sa %s"
@@ -389,7 +389,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Hindi matantsa ang libreng puwang sa %s"
@@ -422,7 +422,7 @@ msgstr "Kunin ang Source %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Bigo sa pagkuha ng ilang mga arkibo."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
 
@@ -431,47 +431,47 @@ msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Utos na build '%s' ay bigo.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Bigo ang prosesong anak"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Walang build depends ang %s.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -480,7 +480,7 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -489,14 +489,14 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -505,7 +505,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:1357
+#: cmdline/apt-get.cc:1358
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -514,30 +514,30 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Hindi mabuo ang build-dependencies para sa %s."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kumokonekta sa %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -622,16 +622,20 @@ msgstr ""
 "para sa karagdagang impormasyon at mga option.\n"
 "                       Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -640,6 +644,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -669,8 +674,9 @@ msgstr "%s ay pinakabagong bersyon na.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Naghintay, para sa %s ngunit wala nito doon"
@@ -864,7 +870,7 @@ msgstr "Hindi maka-likha ng socket"
 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Bigo"
 
@@ -910,7 +916,7 @@ msgstr "Nag-timeout ang socket ng datos"
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 
@@ -1044,93 +1050,185 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Bigo ang pagpili"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Nag-timeout ang koneksyon"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Naghihintay ng panimula"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Maling linyang panimula"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Sira ang range support ng HTTP server na ito"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Di kilalang anyo ng petsa"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Maling datos sa panimula"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Internal na error"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Tumama "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Kunin: "
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "DiPansin "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Err "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [May ginagawa]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Pagpalit ng Media: Ikasa ang disk na may pangalang\n"
+" '%s'\n"
+"sa drive '%s' at pindutin ang enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+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:40
+msgid "Authentication warning overridden.\n"
+msgstr ""
+"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 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:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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."
@@ -1138,21 +1236,21 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1160,31 +1258,27 @@ 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
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Oo, gawin ang sinasabi ko!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1195,19 +1289,19 @@ msgstr ""
 "Upang magpatuloy, ibigay ang pariralang '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Abort."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Nais niyo bang magpatuloy?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "May mga talaksang hindi nakuha"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1215,19 +1309,19 @@ msgstr ""
 "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
 "subukang may --fix-missing?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Hindi maayos ang mga kulang na pakete."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Ina-abort ang pag-instol."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1237,15 +1331,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1261,17 +1355,17 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1281,7 +1375,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:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1289,7 +1383,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:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
@@ -1308,7 +1402,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:628
+#: apt-private/private-install.cc:638
 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"
@@ -1319,70 +1413,70 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Sirang mga pakete"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Mga paketeng mungkahi:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Mga paketeng rekomendado:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1390,136 +1484,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Nakaluklok]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Nakaluklok]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Nakaluklok]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [Nakaluklok]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "ngunit ang %s ay nakaluklok"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ngunit hindi ito maaaring iluklok"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "ngunit ito ay birtwal na pakete"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "ngunit ito ay hindi nakaluklok"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "ngunit ito ay hindi iluluklok"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " o"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Ang susunod na mga pakete ay iu-upgrade:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (dahil sa %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1527,27 +1601,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu iniluklok muli, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nai-downgrade, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
@@ -1556,7 +1630,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[O/h]"
 
@@ -1564,36 +1638,28 @@ msgstr "[O/h]"
 #. 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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "O"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "H"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1607,37 +1673,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-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:40
-msgid "Authentication warning overridden.\n"
-msgstr ""
-"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
-
-#: apt-private/private-download.cc:91 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-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1648,74 +1683,44 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: 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-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Tapos"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Tumama "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Kunin: "
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "DiPansin "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Err "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [May ginagawa]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Pagpalit ng Media: Ikasa ang disk na may pangalang\n"
-" '%s'\n"
-"sa drive '%s' at pindutin ang enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Hindi mabasa ang %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1792,36 +1797,434 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Pinagsasama ang magagamit na impormasyon"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Tinawagan ang DropNode sa naka-link pa na node"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Bigo sa paghanap ng elemento ng hash!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Hindi ma-stat ang %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Bigo ang pagreserba ng diversion"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Hindi makapagsulat sa %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Internal error sa AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s"
+msgid "Error processing directory %s"
+msgstr "Error sa pagproseso ng directory %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dobleng pagdagdag ng diversion %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Error sa pagproseso ng Contents %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Walang mga pinili na tugma"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Nadobleng talaksang conf %s/%s"
+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:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
+
+#: ftparchive/cachedb.cc:94
+#, 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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Hindi mabuksan ang talaksang DB %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Bigo ang pag-stat ng %s"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Bigo ang pagbasa ng link %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Walang kontrol rekord ang arkibo"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Walang field ng pakete ang arkibo"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s ay walang override entry\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s ay walang override entry para sa pinagmulan\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s ay wala ring override entry na binary\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1847,17 +2250,6 @@ msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s"
 msgid "The diversion path is too long"
 msgstr "Sobrang haba ng path na diversion"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1886,30 +2278,36 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
 msgid "Unable to stat %s"
 msgstr "Hindi ma-stat ang %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Tinawagan ang DropNode sa naka-link pa na node"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Bigo sa pagsara ng talaksang %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Bigo sa paghanap ng elemento ng hash!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Bigo ang pagreserba ng diversion"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Internal error sa AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, 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'"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Internal error, hindi mahanap ang miyembrong %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dobleng pagdagdag ng diversion %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Di maintindihang talaksang control"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Nadobleng talaksang conf %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1957,205 +2355,52 @@ msgstr "Bigo ang checksum ng tar, sira ang arkibo"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Hindi suportado ang sistema ng paketeng '%s'"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Nagsulat ng %i na record.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, 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:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, 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 "This is not a valid DEB archive, missing '%s' member"
+msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang "
-"mismatch\n"
+msgid "Internal error, could not locate member %s"
+msgstr "Internal error, hindi mahanap ang miyembrong %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Di maintindihang talaksang control"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Di tugmang MD5Sum"
-
-#: 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/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/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Walang laman ang cache ng pakete"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Sira ang talaksan ng cache ng pakete"
-
-#: 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: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: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: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:321
-msgid "Depends"
-msgstr "Dependensiya"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "PreDepends"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Mungkahi"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Rekomendado"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Tunggali"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Pumapalit"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Linalaos"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "importante"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "kailangan"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standard"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "optional"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "extra"
+msgid "List directory %spartial is missing."
+msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ang driver ng paraang %s ay hindi mahanap."
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Nawawala ang directory ng arkibo %spartial."
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:99
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
+msgid "Unable to lock directory %s"
+msgstr "Hindi maaldaba ang directory ng talaan"
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Hindi umandar ng tama ang paraang %s"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
 
-#: apt-pkg/acquire-worker.cc:455
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, 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."
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
-
-#: 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 "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"
+msgid "Retrieving file %li of %li"
+msgstr "Kinukuha ang talaksang %li ng %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2176,35 +2421,35 @@ msgstr "Di tugmang laki"
 msgid "Invalid file format"
 msgstr "Di tanggap na operasyon %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2212,12 +2457,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2226,12 +2471,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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2239,166 +2484,114 @@ msgstr ""
 "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
 "paketeng %s."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Hindi akma ang versioning system ng cache"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Ang driver ng paraang %s ay hindi mahanap."
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
+msgid "Is the package %s installed?"
+msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Hindi umandar ng tama ang paraang %s"
 
-#: 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/acquire-worker.cc:455
+#, 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/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/algorithms.cc:265
+#, 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/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/algorithms.cc:1086
+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/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
-"Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya."
+"Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
 
-#: 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/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/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/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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Kinukuha ang Talaksang Provides"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release '%s' para sa '%s' ay hindi nahanap"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Block ng nagbebenta %s ay walang fingerprint"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Nawawala ang directory ng talaan %spartial."
+msgid "Couldn't find task '%s'"
+msgstr "Hindi mahanap ang paketeng %s"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Nawawala ang directory ng arkibo %spartial."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Hindi mahanap ang paketeng %s"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "Retrieving file %li of %li (%s remaining)"
-msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Hindi mahanap ang paketeng %s"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:626
 #, 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."
+msgid "Can't select versions from package '%s' as it is purely virtual"
 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/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Hindi ma-stat ang %s"
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, 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:444
+#: apt-pkg/cacheset.cc:647
 #, 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"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Hindi mabuksan ang talaksang %s"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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
@@ -2480,56 +2673,89 @@ msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "Hindi ma-stat ang %s"
 
-#: apt-pkg/algorithms.cc:1086
-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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Ginagawa ang puno ng mga dependensiya"
 
-#: 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Bersyong Kandidato"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Pagbuo ng Dependensiya"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "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/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Nagsulat ng %i na record.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
+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:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang "
+"mismatch\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Di tugmang MD5Sum"
 
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2556,6 +2782,217 @@ msgstr "Di tanggap na linya sa talaksang diversion: %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Hindi suportado ang sistema ng paketeng '%s'"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Hindi mabuksan ang talaksang %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Walang laman ang cache ng pakete"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Sira ang talaksan ng cache ng pakete"
+
+#: 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: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: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: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:321
+msgid "Depends"
+msgstr "Dependensiya"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "PreDepends"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Mungkahi"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Rekomendado"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Tunggali"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Pumapalit"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Linalaos"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "importante"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "kailangan"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standard"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "optional"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "Kinukuha ang Talaksang Provides"
+
+#: 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/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/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 record in the preferences file %s, no Package header"
+msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2631,221 +3068,147 @@ msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
 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/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' para sa '%s' ay hindi nahanap"
+#: 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/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Hindi mahanap ang paketeng %s"
-
-#: 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:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Hindi mahanap ang paketeng %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 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"
+"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/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Block ng nagbebenta %s ay walang fingerprint"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "Di mai-stat ang mount point %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "Iniluklok ang %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Bigo sa pag-stat ng cdrom"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "Isasaayos ang %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala."
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Tinatanggal ang %s"
+msgid "Command line option %s is not understood"
+msgstr "Opsyon sa command line %s ay di naintindihan."
 
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Natanggal ng lubusan ang %s"
+#: 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/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Option %s requires an argument."
+msgstr "Opsyon %s ay nangangailangan ng argumento"
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
+"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
+"=<halaga>."
 
-#. FIXME: use a better string after freeze
-#: 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: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:989
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Preparing %s"
-msgstr "Hinahanda ang %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Unpacking %s"
-msgstr "Binubuklat ang %s"
+msgid "Option '%s' is too long"
+msgstr "Opsyon '%s' ay labis ang haba"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Hinahanda ang %s upang isaayos"
+msgid "Sense %s is not understood, try true or false."
+msgstr "Hindi naintindihan ang %s, subukan ang true o false."
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Installed %s"
-msgstr "Iniluklok ang %s"
+msgid "Invalid operation %s"
+msgstr "Di tanggap na operasyon %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Naghahanda para sa pagtanggal ng %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Hindi kilalang katagang uri: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Removed %s"
-msgstr "Tinanggal ang %s"
+msgid "Opening configuration file %s"
+msgstr "Binubuksan ang talaksang pagsasaayos %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan."
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Completely removed %s"
-msgstr "Natanggal ng lubusan ang %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntax error %s:%u: Maling anyo ng Tag"
 
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: 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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, 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:110
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+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/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2963,54 +3326,11 @@ msgstr "Problema sa pag-unlink ng talaksan"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Tapos"
-
-#. 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"
+msgid "No keyring installed in %s."
+msgstr "Ina-abort ang pag-instol."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3065,528 +3385,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntax error %s:%u: Sinama mula dito"
+msgid "%c%s... Error!"
+msgstr "%c%s... Error!"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
+msgid "%c%s... Done"
+msgstr "%c%s... Tapos"
 
-#: apt-pkg/contrib/configuration.cc:900
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Tapos"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Opsyon %s ay nangangailangan ng argumento"
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "%lih %limin %lis"
 msgstr ""
-"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
-"=<halaga>."
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opsyon '%s' ay labis ang haba"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Hindi naintindihan ang %s, subukan ang true o false."
+msgid "Selection %s not found"
+msgstr "Piniling %s ay hindi nahanap"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Error sa pagproseso ng directory %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Hindi maaldaba ang directory ng talaan"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Error sa pagproseso ng Contents %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "Walang mga pinili na tugma"
 
-#: ftparchive/apt-ftparchive.cc:919
-#, 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:65
-#, 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:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Hindi mabuksan ang talaksang DB %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Bigo ang pagbasa ng link %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Walang kontrol rekord ang arkibo"
 
-#: ftparchive/cachedb.cc:594
-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"
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "Iniluklok ang %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, 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 "
+msgid "Configuring %s"
+msgstr "Isasaayos ang %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Bigo sa pag-resolba ng %s"
+msgid "Removing %s"
+msgstr "Tinatanggal ang %s"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Bigo ang paglakad sa puno"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Natanggal ng lubusan ang %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "Bigo ang pagbukas ng %s"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr ""
 
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Bigo ang pagbasa ng link %s"
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Bigo ang pag-unlink ng %s"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Hindi mabuksan ang talaksang %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Bigo ang pag-link ng %s sa %s"
+msgid "Preparing %s"
+msgstr "Hinahanda ang %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink limit na %sB tinamaan.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Walang field ng pakete ang arkibo"
+msgid "Unpacking %s"
+msgstr "Binubuklat ang %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s ay walang override entry\n"
+msgid "Preparing to configure %s"
+msgstr "Hinahanda ang %s upang isaayos"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
+msgid "Installed %s"
+msgstr "Iniluklok ang %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ay walang override entry para sa pinagmulan\n"
+msgid "Preparing for removal of %s"
+msgstr "Naghahanda para sa pagtanggal ng %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ay wala ring override entry na binary\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Bigo ang pagreserba ng memory"
+msgid "Removed %s"
+msgstr "Tinanggal ang %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "Natanggal ng lubusan ang %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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"
+msgid "Can not write log (%s)"
+msgstr "Hindi makapagsulat sa %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Bigo ang paglikha ng FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Bigo ang pag-fork"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Anak para sa pag-Compress"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Error na internal, bigo ang paglikha ng %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Bigo ang IO sa subprocess/talaksan"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema sa pag-unlink ng %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
 
 #~ 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 82462de74..aced1a532 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,23 +1,23 @@
 # Turkish translation for apt
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # Copyright (c) 2013 Debian L10n Turkish 2013
-# Mert Dirik <mertdirik@gmail.com>, 2013.
+# Mert Dirik <mertdirik@gmail.com>, 2013-2014.
 # This file is distributed under the same license as the apt package.
 # Rosetta Contributors, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2013-02-18 03:41+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\n"
+"PO-Revision-Date: 2014-08-01 02:29+0200\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
-"Language-Team: Debian l10n Turkish\n"
+"Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n>1);\n"
-"X-Generator: Poedit 1.5.5\n"
+"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"X-Generator: Poedit 1.5.4\n"
 "X-Launchpad-Export-Date: 2013-02-04 12:16+0000\n"
 
 #: cmdline/apt-cache.cc:149
@@ -99,76 +99,76 @@ msgstr "Hesaplanan toplam alan: "
 msgid "Package file %s is out of sync."
 msgstr "%s paket dosyası eşzamansız."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "En az bir arama örüntüsü vermelisiniz"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%s paketi bulunamadı"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Paket dosyaları:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "SabitlenmiÅŸ paketler:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(bulunamadı)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  Kurulu: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Aday: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Paket sabitleme: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Sürüm çizelgesi:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -260,6 +260,11 @@ msgid ""
 "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
 "mount point."
 msgstr ""
+"Öntanımlı bağlama noktasında bir CD-ROM algılanamadı.\n"
+"CD-ROM bağlama noktasını ayarlamak için --cdrom seçeneğini kullanmayı "
+"deneyebilirsiniz.\n"
+"Otomatik CD-ROM ve bağlantı noktası algılama hakkında daha fazla bilgi almak "
+"için 'man apt-cdrom' komutunu kullanabilirsiniz."
 
 #: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -299,19 +304,19 @@ msgstr ""
 "cache=/tmp\n"
 
 #: cmdline/apt-get.cc:245
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package for architecture '%s'"
-msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
+msgstr "'%s' mimarisi için bir paket bulunamadı"
 
 #: cmdline/apt-get.cc:327
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package '%s' with version '%s'"
-msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
+msgstr "'%s' paketinin '%s' sürümü bulunamadı"
 
 #: cmdline/apt-get.cc:330
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package '%s' with release '%s'"
-msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
+msgstr "'%s' paketi '%s' dağıtım sürümünde bulunamadı"
 
 #: cmdline/apt-get.cc:367
 #, c-format
@@ -319,9 +324,9 @@ msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Kaynak paket olarak '%s' yerine '%s' kullanılacak\n"
 
 #: cmdline/apt-get.cc:423
-#, fuzzy, c-format
+#, 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"
+msgstr "'%2$s' paketinin '%1$s' sürümünü bulunamadı"
 
 #: cmdline/apt-get.cc:454
 #, c-format
@@ -329,7 +334,7 @@ msgid "Couldn't find package %s"
 msgstr "%s paketi bulunamadı"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s elle kurulmuş olarak ayarlı.\n"
@@ -359,7 +364,7 @@ msgstr "Ä°ndirme dizini kilitlenemiyor"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s paketinin kaynak paketi bulunamadı"
@@ -392,7 +397,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s içindeki boş alan miktarı belirlenemedi"
@@ -425,7 +430,7 @@ msgstr "%s kaynağını al\n"
 msgid "Failed to fetch some archives."
 msgstr "Bazı arşivler alınamadı."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde"
 
@@ -434,30 +439,30 @@ msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Paket açma komutu '%s' başarısız.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "İnşa komutu '%s' başarısız oldu.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Alt süreç başarısız"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -466,17 +471,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:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s paketinin hiç inşa bağımlılığı yok.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +490,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:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -493,12 +498,12 @@ msgid ""
 msgstr ""
 "%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı."
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -507,7 +512,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -515,30 +520,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 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:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) paketinin değişim günlüğü"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Desteklenen birimler:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -628,16 +633,20 @@ msgstr ""
 "sayfalarına bakabilirsiniz.\n"
 "                       Bu APT'nin Süper İnek Güçleri vardır.\n"
 
-#: cmdline/apt-helper.cc:35
-#, fuzzy
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 msgid "Must specify at least one pair url/filename"
-msgstr "Kaynağının indirileceği en az bir paket seçilmeli"
+msgstr "En az bir adet url/dosyaadı çifti belirtilmelidir"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
-msgstr ""
+msgstr "İndirme Başarısız"
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
+#, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -646,9 +655,19 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
+"Usage: apt-helper [seçenekler] komut\n"
+"       apt-helper [seçenekler] download-file uri hedef-konum\n"
+"\n"
+"apt-helper apt'nin dahili yardımcı aracıdır\n"
+"\n"
+"Komutlar:\n"
+"   download-file - verilen adresi hedef yola kaydet\n"
+"\n"
+"                 Bu APT yardımcısının Süper Meep Güçleri var.\n"
 
 #: cmdline/apt-mark.cc:68
 #, c-format
@@ -675,8 +694,9 @@ msgstr "%s zaten tutulacak şekilde ayarlanmış.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s için beklenildi ama o gelmedi"
@@ -696,7 +716,6 @@ msgid "Executing dpkg failed. Are you root?"
 msgstr "'dpkg' çalıştırılamadı. root olduğunuzdan emin misiniz?"
 
 #: cmdline/apt-mark.cc:392
-#, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -725,11 +744,16 @@ msgstr ""
 "Kullanım: apt-mark [seçenekler] {auto|manual} paket1 [paket2 ...]\n"
 "\n"
 "apt-mark paketleri otomatik ya da elle kurulmuÅŸ olarak iÅŸaretlemeye\n"
-"yarayan basit bir komut satırı arayüzüdür.\n"
+"ve mevcut işaretleri görmeye yarayan basit bir komut satırı arayüzüdür.\n"
 "\n"
 "Komutlar:\n"
 "   auto - Belirtilen paketleri otomatik kurulmuÅŸ olarak iÅŸaretle\n"
 "   manual - Belirtilen paketleri elle kurulmuÅŸ olarak iÅŸaretle\n"
+"   hold - Paketi tutulacak ÅŸekilde iÅŸaretle\n"
+"   unhold - Paketin tutuluyor işaretini kaldır\n"
+"   showauto - Otomatik olarak kurulmuş paketlerin listesini görüntüle\n"
+"   showmanual - Elle kurulmuş paketlerin listesini görüntüle\n"
+"   showhold - Tutulur durumda olan paketlerin listesini görüntüle\n"
 "\n"
 "Seçenekler:\n"
 "  -h  Bu yardım metni.\n"
@@ -763,6 +787,24 @@ msgid ""
 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""
+"Usage: apt [seçenekler] komut\n"
+"\n"
+"apt için komut satırı arayüzü.\n"
+"Temel komutlar: \n"
+" list - Paketleri adlarına göre listele\n"
+" search - Paket açıklamalarında arama yap\n"
+" show - Paket ayrıntılarını görüntüle\n"
+"\n"
+" update - Mevcut paket listesini güncelle\n"
+"\n"
+" install - paket kur\n"
+" remove  - paket kaldır\n"
+"\n"
+" upgrade - sistemi yükselt (paketleri kurarak ve yükselterek)\n"
+" full-upgrade - sistemi yükselt (paketleri kurarak,yükselterek ve "
+"kaldırarak)\n"
+"\n"
+" edit-sources - kaynak bilgi dosyasını düzenle\n"
 
 #: methods/cdrom.cc:203
 #, c-format
@@ -890,7 +932,7 @@ msgstr "Bir soket oluşturulamadı"
 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Başarısız"
 
@@ -936,7 +978,7 @@ msgstr "Veri soketi bağlantısı zaman aşımına uğradı"
 msgid "Unable to accept connection"
 msgstr "Bağlantı kabul edilemiyor"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Dosya sağlaması yapılamadı"
 
@@ -1011,9 +1053,9 @@ msgid "Temporary failure resolving '%s'"
 msgstr "'%s' çözümlenirken geçici bir sorunla karşılaşıldı"
 
 #: methods/connect.cc:209
-#, fuzzy, c-format
+#, c-format
 msgid "System error resolving '%s:%s'"
-msgstr "'%s' çözümlenirken geçici bir sorunla karşılaşıldı"
+msgstr "'%s:%s' çözümlenirken bir sistem hatası oluştu"
 
 #: methods/connect.cc:211
 #, c-format
@@ -1045,6 +1087,8 @@ msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
+"Temiz-imzalı dosya geçerli değil, '%s' hatası alındı (ağ kimlik doğrulama "
+"gerektiriyor mu?)"
 
 #: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
@@ -1064,93 +1108,185 @@ msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değ
 msgid "Empty files can't be valid archives"
 msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Dosyaya yazılamadı"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Sunucundan okunurken hata. Uzak sonlu kapalı bağlantı"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Sunucundan okunurken hata"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Dosyaya yazılamadı"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Seçme başarısız"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Bağlantı zaman aşımına uğradı"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Çıktı dosyasına yazılırken hata"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Başlıklar bekleniyor"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Kötü başlık satırı"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP sunucusu geçersiz bir cevap başlığı gönderdi"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "HTTP sunucusunun aralık desteği bozuk"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Bilinmeyen tarih biçimi"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Kötü başlık verisi"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Bağlantı başarısız"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "İç hata"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
-msgid "Sorting"
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Bağlandı  "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Alınıyor: "
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Yoksay    "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Hata      "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Çalışıyor]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
 msgstr ""
+"Ortam değişimi: Lütfen '%2$s' sürücüsüne\n"
+" '%1$s'\n"
+"olarak etiketlenmiş diski takın ve enter tuşuna basın.\n"
 
-#: apt-private/private-install.cc:81
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"
+msgstr "Sıralama"
+
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Bazı paketlerin kimlik denetimi yapılamadı"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "Paketler doÄŸrulanmadan kurulsun mu?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 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:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "İç hata, Sıralama tamamlanamadı"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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 "
@@ -1158,53 +1294,49 @@ 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Evet, söylediğim şekilde yap!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1215,19 +1347,19 @@ msgstr ""
 "Devam etmek için '%s' ifadesini yazınız\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Vazgeç."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Devam etmek istiyor musunuz?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Bazı dosyalar indirilemedi"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1235,19 +1367,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:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "Eksik paketler düzeltilemedi."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Kurulum iptal ediliyor."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1261,15 +1393,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1287,15 +1419,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "İç hata, AutoRemover bazı şeyleri bozdu"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1307,7 +1439,7 @@ msgstr[1] ""
 "Aşağıdaki paketler otomatik olarak kurulmuş ve artık bu paketlere gerek "
 "duyulmuyor:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1315,7 +1447,7 @@ 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:518
+#: apt-private/private-install.cc:519
 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."
@@ -1335,7 +1467,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:628
+#: apt-private/private-install.cc:638
 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"
@@ -1347,212 +1479,194 @@ msgstr ""
 "bazı paketlerin henüz oluşturulamamış  ya da oluşturulmakta\n"
 "olduğunu gösterir."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Bozuk paketler"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Aşağıdaki ek paketler de kurulacak:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Önerilen paketler:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Tavsiye edilen paketler:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s atlanıyor, bu paket zaten kurulu ve yükseltme seçilmemiş.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s atlanıyor, bu paket kurulu değil ve sadece yükseltmeler isteniyor.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "%s paketinin yeniden kurulumu mümkün değil, çünkü paket internetten "
 "indirilemedi.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s zaten en yeni sürümde.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "'%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "'%4$s' nedeniyle '%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "'%s' kurulu değildi, dolayısıyla kaldırılmadı. Bunu mu demek istediniz: "
 "'%s'?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "'%s' kurulu değildi, dolayısıyla kaldırılmadı.\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
-msgstr ""
+msgstr "Listeleme"
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, 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] ""
+"Fazladan %i sürüm daha var. Görmek için '-a' anahtarını kullanabilirsiniz."
 msgstr[1] ""
+"Fazladan %i sürüm daha var. Bu sürümleri görmek için '-a' anahtarını "
+"kullanabilirsiniz."
 
-#: 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."
+#: 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 ""
-"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."
+"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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
-msgstr ""
+msgstr "bilinmeyen"
 
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
+#: apt-private/private-output.cc:265
+#, c-format
 msgid "[installed,upgradable to: %s]"
-msgstr " [Kuruldu]"
+msgstr "[kurulu,yükseltilebilir: %s]"
 
-#: apt-private/private-output.cc:237
-#, fuzzy
+#: apt-private/private-output.cc:268
 msgid "[installed,local]"
-msgstr " [Kuruldu]"
+msgstr "[kurulu,yerel]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
-msgstr ""
+msgstr "[kurulu,otomatik-kaldırılabilir]"
 
-#: apt-private/private-output.cc:242
-#, fuzzy
+#: apt-private/private-output.cc:272
 msgid "[installed,automatic]"
-msgstr " [Kuruldu]"
+msgstr "[kurulu,otomatik]"
 
-#: apt-private/private-output.cc:244
-#, fuzzy
+#: apt-private/private-output.cc:274
 msgid "[installed]"
-msgstr " [Kuruldu]"
+msgstr "[kurulu]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
-msgstr ""
+msgstr "[şundan yükseltilebilir: %s]"
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
-msgstr ""
+msgstr "[artık-yapılandırma]"
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "ama %s kurulu"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ama %s kurulacak"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "ama kurulabilir deÄŸil"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "ama o bir sanal paket"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "ama kurulu deÄŸil"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "ama kurulmayacak"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " ya da"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "Aşağıdaki YENİ paketler kurulacak:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Aşağıdaki paketler KALDIRILACAK:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Aşağıdaki paketler yükseltilecek:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 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:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s nedeniyle) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1560,27 +1674,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu paket yeniden kurulacak, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu paketin sürümü düşürülecek, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
@@ -1589,7 +1703,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[E/h]"
 
@@ -1597,36 +1711,28 @@ msgstr "[E/h]"
 #. 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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "E"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "H"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "Tam Metin Arama"
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1634,123 +1740,66 @@ 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] ""
+"Fazladan %i kayıt daha var. Görmek için '-a' anahtarını kullanabilirsiniz."
 msgstr[1] ""
+"Fazladan %i kayıt daha var. Görmek için '-a' anahtarını kullanabilirsiniz."
 
 #: apt-private/private-show.cc:163
 msgid "not a real package (virtual)"
-msgstr ""
-
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Bazı paketlerin kimlik denetimi yapılamadı"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Paketler doÄŸrulanmadan kurulsun mu?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s ağdan alınamadı. %s\n"
+msgstr "gerçek bir paket değil (sanal)"
 
 #: apt-private/private-sources.cc:58
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to parse %s. Edit again? "
-msgstr "%s, %s olarak yeniden adlandırılamadı"
+msgstr "%s ayrıştırılamadı. Tekrar düzenlemek ister misiniz?"
 
 #: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "'%s' dosyası değişti, lütfen 'apt-get update' komutunu çalıştırın."
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
-msgstr ""
+#: 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-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i paket yükseltilebilir. Bu paketi görmek için 'apt list --upgradable' "
+"komutunu çalıştırın.\n"
+msgstr[1] ""
+"%i paket yükseltilebilir. Bu paketleri görmek için 'apt list --upgradable' "
+"komutunu çalıştırın.\n"
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr "Tüm paketler güncel."
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Bitti"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Bağlandı  "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Alınıyor: "
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Yoksay    "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Hata      "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Çalışıyor]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Ortam değişimi: Lütfen '%2$s' sürücüsüne\n"
-" '%1$s'\n"
-"olarak etiketlenmiş diski takın ve enter tuşuna basın.\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s okunamıyor"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1771,9 +1820,9 @@ msgid "Can not read mirror file '%s'"
 msgstr "Yansı dosyası %s okunamıyor"
 
 #: methods/mirror.cc:315
-#, fuzzy, c-format
+#, c-format
 msgid "No entry found in mirror file '%s'"
-msgstr "Yansı dosyası %s okunamıyor"
+msgstr "'%s' yansı dosyasında hiç girdi bulunmuyor"
 
 #: methods/mirror.cc:445
 #, c-format
@@ -1827,36 +1876,430 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Kullanılabilir bilgiler birleştiriliyor"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode hala bağlı olan düğüm üzerinde çağrıldı"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Sağlama elementi bulunamadı"
+#: cmdline/apt-extracttemplates.cc:254
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "mkstemp %s başarısız oldu"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Yönlendirme tahsisi başarısız oldu"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s dosyasına yazılamıyor"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion'da iç hata"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf sürümü alınamıyor. debconf kurulu mu?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Paket uzantı listesi çok uzun"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "%s dizinini iÅŸlemede hata"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Kaynak uzantı listesi çok uzun"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "İçindekiler dosyasına üstbilgi yazmada hata"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s"
+msgid "Error processing contents %s"
+msgstr "%s içeriğini işlemede hata"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Hiçbir seçim eşleşmedi"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "%s/%s yapılandırma dosyası zaten mevcut"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik"
+
+#: ftparchive/cachedb.cc:65
+#, 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:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Veritabanı dosyası %s açılamadı: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s durum bilgisi alınamadı"
+
+#: ftparchive/cachedb.cc:332
+msgid "Failed to read .dsc"
+msgstr ".dsc dosyası okunamadı"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arşivin denetim kaydı yok"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Arşivde paket alanı yok"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s için geçersiz kılma girdisi yok\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s geliÅŸtiricisi %s, %s deÄŸil\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  '%s' paketinin yerine geçecek bir kaynak paket yok\n"
+
+#: ftparchive/writer.cc:710
+#, 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:351 ftparchive/contents.cc:382
+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
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Hatalı geçersiz kılma %s satır %llu (%s)"
+
+#: 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ı"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s, %s olarak yeniden adlandırılamadı"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1882,17 +2325,6 @@ msgstr "Bu paket yönlendirme hedefine (%s/%s) yazmayı deniyor"
 msgid "The diversion path is too long"
 msgstr "Yönlendirme yolu çok uzun"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1921,30 +2353,36 @@ msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak isti
 msgid "Unable to stat %s"
 msgstr "%s durum bilgisi alınamadı"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode hala bağlı olan düğüm üzerinde çağrıldı"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s dosyası kapatılamadı"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Sağlama elementi bulunamadı"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Yönlendirme tahsisi başarısız oldu"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion'da iç hata"
+
+#: apt-inst/filelist.cc:477
 #, 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"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "İç hata, %s üyesi bulunamadı"
+msgid "Double add of diversion %s -> %s"
+msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ayrıştırılamayan 'control' dosyası"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "%s/%s yapılandırma dosyası zaten mevcut"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1992,200 +2430,52 @@ msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Bilinmeyen TAR başlığı türü %u, üye %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "dpkg çalıştırılıyor"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Paketleme sistemi '%s' desteklenmiyor"
-
-#: 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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i kayıt yazıldı.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, 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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
-#, 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"
-
-#: 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 "%2$i eksik dosya ve %3$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n"
-
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "%s için kimlik doğrulama kaydı bulunamadı."
-
-#: apt-pkg/indexcopy.cc:521
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Sağlama yapılamadı: %s"
-
-#: 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/cachefile.cc:98
-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:116
-msgid "The list of sources could not be read."
-msgstr "Kaynak listesi okunamadı."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Boş paket önbelleği"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Paket önbelleği dosyası bozulmuş"
-
-#: 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:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Paket önbellek dosyası bozulmuş, çok küçük"
+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-pkg/pkgcache.cc:174
+#: apt-inst/deb/debfile.cc:132
 #, 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: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:321
-msgid "Depends"
-msgstr "Bağımlılıklar"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "ÖnBağımlılıklar"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Önerdikleri"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Tavsiye ettikleri"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Çakışmalar"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "DeÄŸiÅŸtirilenler"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Eskiyenler"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Bozdukları"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "GeliÅŸtirdikleri"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "önemli"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "gerekli"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "standart"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "seçimlik"
+msgid "Internal error, could not locate member %s"
+msgstr "İç hata, %s üyesi bulunamadı"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "ilave"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Ayrıştırılamayan 'control' dosyası"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' paketinin kurulu olduÄŸundan emin olun.\n"
+msgid "List directory %spartial is missing."
+msgstr "Liste dizini %spartial bulunamadı."
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s yöntemi düzgün şekilde başlamadı"
+msgid "Archives directory %spartial is missing."
+msgstr "Arşiv dizini %spartial bulunamadı."
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire.cc:99
 #, 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."
+msgid "Unable to lock directory %s"
+msgstr "%s dizini kilitlenemiyor"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "İndeks dosyası türü '%s' desteklenmiyor"
-
-#: 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/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"
+msgid "Clean of %s is not supported"
+msgstr "%s temizliÄŸi desteklenmiyor"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Durum dosyası (StateFile) %s açılamadı."
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Alınan dosya: %li / %li (%s kaldı)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
+msgid "Retrieving file %li of %li"
+msgstr "Alınan dosya: %li / %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2201,11 +2491,10 @@ msgid "Size mismatch"
 msgstr "Boyutlar eÅŸleÅŸmiyor"
 
 #: apt-pkg/acquire-item.cc:173
-#, fuzzy
 msgid "Invalid file format"
-msgstr "Geçersiz işlem: %s"
+msgstr "Geçersiz dosya biçimi"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2214,17 +2503,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2233,12 +2522,12 @@ msgstr ""
 "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
 "güncelleştirmeleri uygulanmayacak."
 
-#: apt-pkg/acquire-item.cc:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2248,12 +2537,12 @@ msgstr ""
 "indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG hatası: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2262,177 +2551,125 @@ 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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, 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/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: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
+#: apt-pkg/acquire-worker.cc:116
 #, 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: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: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."
+msgid "The method driver %s could not be found."
+msgstr "Yöntem sürücüsü %s bulunamadı."
 
-#: 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/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "%s paketi kurulu mu?"
 
-#: 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s yöntemi düzgün şekilde başlamadı"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, 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ı"
+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/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı"
+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/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/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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Dosya Sağlananları Toplanıyor"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var."
 
-#: 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/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/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası"
+#: apt-pkg/cachefile.cc:98
+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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Sağlayıcı bloğu %s parmak izi içermiyor"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Kaynak listesi okunamadı."
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "Liste dizini %spartial bulunamadı."
+msgid "Release '%s' for '%s' was not found"
+msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arşiv dizini %spartial bulunamadı."
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "%s dizini kilitlenemiyor"
+msgid "Couldn't find task '%s'"
+msgstr "'%s' görevi bulunamadı"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Alınan dosya: %li / %li (%s kaldı)"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:615
 #, c-format
-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."
+msgid "Couldn't find any package by glob '%s'"
+msgstr "'%s' ifadesine eşleşen herhangi bir paket bulunamadı"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "%s için dosya bilgisi alınamadı."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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)"
+"'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de "
+"seçilemiyor"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, 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)"
+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/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "'%s' paketi yapılandırılamadı. "
+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/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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."
+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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2516,55 +2753,86 @@ msgstr "Yeni kaynak listesi yazılıyor\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Bu disk için olan kaynak listesi girdileri:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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."
+msgid "Unable to stat %s."
+msgstr "%s için dosya bilgisi alınamadı."
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bağımlılık ağacı oluşturuluyor"
 
-#: 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: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 "Failed to open StateFile %s"
+msgstr "Durum dosyası (StateFile) %s açılamadı."
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Çözücüye senaryo gönder"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Çözücüye istek gönder"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Çözüm almak için hazırlan"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 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:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Harici çözücüyü çalıştır"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Paket dosyası %s ayrıştırılamadı (1)"
+msgid "Wrote %i records.\n"
+msgstr "%i kayıt yazıldı.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Paket dosyası %s ayrıştırılamadı (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%2$i eksik dosyayla %1$i kayıt yazıldı.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, 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"
+
+#: 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 "%2$i eksik dosya ve %3$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "%s için kimlik doğrulama kaydı bulunamadı."
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Sağlama yapılamadı: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2591,11 +2859,222 @@ msgstr "'Release' dosyasında (%s) geçersiz 'Valid-Until' girdisi"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Paketleme sistemi '%s' desteklenmiyor"
+
+#: 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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr "Durum: [%3i%%]"
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "dpkg çalıştırılıyor"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "'%s' paketi yapılandırılamadı. "
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Boş paket önbelleği"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Paket önbelleği dosyası bozulmuş"
+
+#: 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:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Paket önbellek dosyası bozulmuş, çok küçük"
+
+#: 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: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:321
+msgid "Depends"
+msgstr "Bağımlılıklar"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "ÖnBağımlılıklar"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Önerdikleri"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Tavsiye ettikleri"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Çakışmalar"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "DeÄŸiÅŸtirilenler"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Eskiyenler"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Bozdukları"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "GeliÅŸtirdikleri"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "önemli"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "gerekli"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standart"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "seçimlik"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "ilave"
+
+#: 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: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: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: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: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: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: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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı"
+
+#: 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:1316
+msgid "Collecting File Provides"
+msgstr "Dosya Sağlananları Toplanı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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "İndeks dosyası türü '%s' desteklenmiyor"
+
+#: 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/sourcelist.cc:127
-#, fuzzy, c-format
+#, 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)"
+"Kaynak listesinin (%2$s)  %1$u numaralı girdisi hatalı (URI ayrıştırma)"
 
 #: apt-pkg/sourcelist.cc:170
 #, c-format
@@ -2674,240 +3153,150 @@ 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: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/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:492
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "'%s' türü bilinmiyor (girdi: %u, kaynak listesi: %s)"
 
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "'%s' görevi bulunamadı"
+#: 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/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, 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:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
+msgid "Unable to parse package file %s (1)"
+msgstr "Paket dosyası %s ayrıştırılamadı (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+msgid "Unable to parse package file %s (2)"
+msgstr "Paket dosyası %s ayrıştırılamadı (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de "
-"seçilemiyor"
+"Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki "
+"sürümleri kullanıldı."
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Sağlayıcı bloğu %s parmak izi içermiyor"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+msgid "Unable to stat the mount point %s"
+msgstr "Bağlama noktasının (%s) durum bilgisi alınamadı"
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Cdrom durum bilgisi alınamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "%s kuruluyor"
+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/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "%s yapılandırılıyor"
+msgid "Command line option %s is not understood"
+msgstr "Komut satırı seçeneği %s anlaşılamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "%s kaldırılıyor"
+msgid "Command line option %s is not boolean"
+msgstr "Komut satırı seçeneği %s mantıksal değer değil"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "%s tamamen kaldırılıyor"
+msgid "Option %s requires an argument."
+msgstr "%s seçeneği bir bağımsız değişkene gerek duyar."
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "%s paketinin kaybolduÄŸu not ediliyor"
+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/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor"
+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"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "'%s' dizini bulunamadı"
+msgid "Option '%s' is too long"
+msgstr "'%s' seçeneği çok uzun"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "'%s' dosyası açılamadı"
+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/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "%s hazırlanıyor"
+msgid "Invalid operation %s"
+msgstr "Geçersiz işlem: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "%s paketi açılıyor"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Tanınamayan tür kısaltması: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "%s paketini yapılandırmaya hazırlanılıyor"
+msgid "Opening configuration file %s"
+msgstr "Yapılandırma dosyası (%s) açılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "%s kuruldu"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Sözdizim hatası %s:%u: Blok ad olmadan başlıyor."
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s paketinin kaldırılmasına hazırlanılıyor"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Sözdizim hatası %s:%u: Kötü biçimlendirilmiş etiket"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "%s kaldırıldı"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Sözdizim hatası %s:%u: Değerden sonra ilave gereksiz"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor"
+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/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s tamamen kaldırıldı"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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:1069
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "İşlem yarıda kesildi"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-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:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan "
-"kaynaklanan bir hata olduÄŸunu belirtiyor."
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-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:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport "
-"raporu yazılamadı"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı"
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-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ı"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Sözdizim hatası %s:%u: Çok fazla yuvalanmış 'include'"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Yönetim dizini (%s) kilitlenemiyor, başka bir işlem tarafından kullanılıyor "
-"olmasın?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Sözdizim hatası %s:%u: Buradan 'include' edilmiş"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, 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?"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Sözdizim hatası %s:%u: Desteklenmeyen yönerge '%s'"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"dpkg kesintiye uğradı, sorunu düzeltmek için elle '%s' komutunu çalıştırın. "
+"Sözdizim hatası %s:%u: clear yönergesi argüman olarak bir seçenek ağacı "
+"gerektirir."
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "KilitlenmemiÅŸ"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3026,54 +3415,11 @@ msgstr "%s dosyasından bağ kaldırma sorunu"
 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"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "%s seçimi bulunamadı"
+msgid "No keyring installed in %s."
+msgstr "%s dizininde kurulu bir anahtar yok."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3130,525 +3476,235 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Command line option %s is not understood"
-msgstr "Komut satırı seçeneği %s anlaşılamadı"
+msgid "%c%s... Error!"
+msgstr "%c%s... Hata!"
 
-#: apt-pkg/contrib/cmndline.cc:168
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Komut satırı seçeneği %s mantıksal değer değil"
+msgid "%c%s... Done"
+msgstr "%c%s... Bitti"
 
-#: 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/progress.cc:181
+msgid "..."
+msgstr "..."
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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."
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, 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 "%lid %lih %limin %lis"
+msgstr "%li gün %li saat %li dk. %li sn."
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "'%s' seçeneği çok uzun"
+msgid "%lih %limin %lis"
+msgstr "%li saat %li dk. %li sn."
 
-#: apt-pkg/contrib/cmndline.cc:341
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, 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 "%limin %lis"
+msgstr "%li dk. %li sn."
 
-#: apt-pkg/contrib/cmndline.cc:391
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Paket uzantı listesi çok uzun"
+msgid "%lis"
+msgstr "%li sn."
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Error processing directory %s"
-msgstr "%s dizinini iÅŸlemede hata"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Kaynak uzantı listesi çok uzun"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "İçindekiler dosyasına üstbilgi yazmada hata"
+msgid "Selection %s not found"
+msgstr "%s seçimi bulunamadı"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Error processing contents %s"
-msgstr "%s içeriğini işlemede hata"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:841
-msgid "No selections matched"
-msgstr "Hiçbir seçim eşleşmedi"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik"
+"Yönetim dizini (%s) kilitlenemiyor, başka bir işlem tarafından kullanılıyor "
+"olmasın?"
 
-#: ftparchive/cachedb.cc:65
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi"
+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?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor"
-
-#: ftparchive/cachedb.cc:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Veritabanı dosyası %s açılamadı: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s bağlantı okuması başarılamadı"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arşivin denetim kaydı yok"
-
-#: ftparchive/cachedb.cc:594
-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"
+"dpkg kesintiye uğradı, sorunu düzeltmek için elle '%s' komutunu çalıştırın. "
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Ağaçta gezinme başarısız"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "KilitlenmemiÅŸ"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s açılamadı"
+msgid "Installing %s"
+msgstr "%s kuruluyor"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Configuring %s"
+msgstr "%s yapılandırılıyor"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "%s bağlantı okuması başarılamadı"
+msgid "Removing %s"
+msgstr "%s kaldırılıyor"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "%s bağlantı koparma başarılamadı"
+msgid "Completely removing %s"
+msgstr "%s tamamen kaldırılıyor"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s, %s konumuna bağlanamadı"
+msgid "Noting disappearance of %s"
+msgstr "%s paketinin kaybolduÄŸu not ediliyor"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, 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:417
-msgid "Archive had no package field"
-msgstr "Arşivde paket alanı yok"
+msgid "Running post-installation trigger %s"
+msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s için geçersiz kılma girdisi yok\n"
+msgid "Directory '%s' missing"
+msgstr "'%s' dizini bulunamadı"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s geliÅŸtiricisi %s, %s deÄŸil\n"
+msgid "Could not open file '%s'"
+msgstr "'%s' dosyası açılamadı"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  '%s' paketinin yerine geçecek bir kaynak paket yok\n"
+msgid "Preparing %s"
+msgstr "%s hazırlanıyor"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, 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:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Bellek ayırma yapılamadı"
+msgid "Unpacking %s"
+msgstr "%s paketi açılıyor"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, 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"
+msgid "Preparing to configure %s"
+msgstr "%s paketini yapılandırmaya hazırlanılıyor"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Geçersiz kılma dosyası %s okunamadı"
+msgid "Installed %s"
+msgstr "%s kuruldu"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Hatalı geçersiz kılma %s satır %llu #1"
+msgid "Preparing for removal of %s"
+msgstr "%s paketinin kaldırılmasına hazırlanılıyor"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Hatalı geçersiz kılma %s satır %llu #2"
+msgid "Removed %s"
+msgstr "%s kaldırıldı"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Hatalı geçersiz kılma %s satır %llu #3"
+msgid "Preparing to completely remove %s"
+msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Bilinmeyen sıkıştırma algoritması '%s'"
+msgid "Completely removed %s"
+msgstr "%s tamamen kaldırıldı"
 
-#: ftparchive/multicompress.cc:103
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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."
+msgid "Can not write log (%s)"
+msgstr "Günlük dosyasına yazılamıyor (%s)"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "DOSYA* oluşturulamadı"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr "/dev/pts bağlı mı?"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork yapılamadı"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr "stdout bir uçbirim mi?"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Çocuğu sıkıştır"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "İşlem yarıda kesildi"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "İç hata, %s oluşturulamadı"
+#: apt-pkg/deb/dpkgpm.cc:1687
+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ı"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5 hesaplanırken okunamadı"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan "
+"kaynaklanan bir hata olduÄŸunu belirtiyor."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s bağı koparılırken sorun çıktı"
+#: apt-pkg/deb/dpkgpm.cc:1700
+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ı"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport "
+"raporu yazılamadı"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Bilinmeyen paket kaydı!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Hata iletisi yerel bir sistem hatasına işaret ettiği için apport raporu "
+"yazılamadı"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Hata iletisi bir dpkg G/Ç hatasına işaret ettiği için apport raporu "
+"yazılamadı"
+
+#~ msgid "ioctl(TIOCGWINSZ) failed"
+#~ msgstr "ioctl(TIOCGWINSZ) başarısız oldu"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "İç hata, AllUpgrade bazı şeyleri bozdu"
 
 #~ 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 c25379895..4f7b34a37 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
@@ -106,74 +106,74 @@ msgstr "Загальний про�тір полічений дл�: "
 msgid "Package file %s is out of sync."
 msgstr "Перелік пакунків %s роз�инхронізований."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "Ви повинні задати не менше одного шаблону пошуку"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Ц� команда є за�тарілою. Будь-ла�ка викори�товуйте 'apt-mark showauto'"
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "�е можу знайти пакунок %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Переліки пакунків:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Кеш не �инхронізований, неможливо знайти по�иланн� на перелік пакунків"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Зафік�овані пакунки:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(не знайдено)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  В�тановлено: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(від�утній)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Фік�атор(pin) пакунка: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Таблиц� вер�ій:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -331,7 +331,7 @@ msgid "Couldn't find package %s"
 msgstr "�е можу знайти пакунок %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s позначений �к в�тановлений вручну.\n"
@@ -363,7 +363,7 @@ msgstr ""
 "Вкажіть �к мінімум один пакунок, дл� �кого необхідно завантажити вихідні "
 "тек�ти"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "�еможливо знайти пакунок з вихідними тек�тами дл� %s"
@@ -394,7 +394,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропу�каємо вже завантажений файл '%s'\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "�е вдало�� визначити кількі�ть вільного мі�ц� в %s"
@@ -427,7 +427,7 @@ msgstr "Завантаженн� вихідних тек�тів %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Де�кі архіви не вдало�� завантажити."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "Завантаженн� завершено в режимі \"тільки завантаженн�\""
 
@@ -437,32 +437,32 @@ msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропу�каєть�� розпакуванн� вихідних тек�тів, тому що вже розпаковано в %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда розпакуванн� '%s' завершила�� невдало.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Перевірте, чи в�тановлений пакунок 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда побудови '%s' закінчила�� невдало.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Породжений проце� завершив�� невдало"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Дл� перевірки залежно�тей дл� побудови необхідно вказати �к мінімум один "
 "пакунок"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -471,17 +471,17 @@ msgstr ""
 "Від�утн� інформаці� про архітектуру дл� %s. Диви�ь apt.conf(5) APT::"
 "�рхітектури дл� налащтуванн�"
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "�еможливо одержати інформацію про залежно�ті дл� побудови %s"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не має залежно�тей дл� побудови.\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -490,7 +490,7 @@ msgstr ""
 "Залежні�ть типу %s дл� %s не може бути задоволена, бо %s не є дозволеним на "
 "'%s' пакунках"
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -498,14 +498,14 @@ msgid ""
 msgstr ""
 "Залежні�ть типу %s дл� %s не може бути задоволена, бо пакунок %s не знайдено"
 
-#: cmdline/apt-get.cc:1312
+#: cmdline/apt-get.cc:1313
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "�е вдало�� задовольнити залежні�ть типу %s дл� %s: В�тановлений пакунок %s "
 "новіше, аніж треба"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -514,7 +514,7 @@ msgstr ""
 "Залежні�ть типу %s дл� %s не може бути задоволена, бо вер�і� пакунку-"
 "кандидата %s не задовольн�є умови по вер�і�м"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -523,30 +523,30 @@ msgstr ""
 "Залежні�ть типу %s дл� %s не може бути задоволена, бо немає пакунку-"
 "кандидата %s потрібної вер�ії"
 
-#: cmdline/apt-get.cc:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "�еможливо задовольнити залежні�ть типу %s дл� пакунка %s: %s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Залежно�ті дл� побудови %s не можуть бути задоволені."
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "Обробка залежно�тей дл� побудови закінчила�� невдало"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Журнал змін дл� %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Підтримувані модулі:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -638,18 +638,22 @@ msgstr ""
 "мі�т�ть більше інформації і опцій.\n"
 "                       Цей APT має Супер-Коров'�чу Силу.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 "Вкажіть �к мінімум один пакунок, дл� �кого необхідно завантажити вихідні "
 "тек�ти"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -658,6 +662,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -687,8 +692,9 @@ msgstr "%s вже був зафік�ований.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s вже був незафік�ований.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Очікував на %s, але його там не було"
@@ -904,7 +910,7 @@ msgstr "�еможливо �творити �окет (socket)"
 msgid "Could not connect data socket, connection timed out"
 msgstr "�еможливо під'єднати �окет (socket) з даними, ча� з'єднанн� вичерпав��"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "�евдача"
 
@@ -950,7 +956,7 @@ msgstr "Ча� з'єднанн� з �окетом даних вичерпав�
 msgid "Unable to accept connection"
 msgstr "�еможливо прийн�ти з'єднанн�"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Проблема хешуванн� файла"
 
@@ -1082,113 +1088,204 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Пу�ті файли не можуть бути правильними архівами"
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Помилка запи�у у файл"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Помилка зчитуванн� з �ервера. Віддалена �торона закрила з'єднанн�"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Помилка зчитуванн� з �ервера"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Помилка запи�у у файл"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Вибір провалив��"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Ча� очікуванн� з'єднанн� вийшов"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Помилка запи�у у вихідний файл"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Очікуванн� на заголовки"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "�евірний р�док заголовку"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP �ервер віді�лав невірний заголовок 'reply'"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP �ервер віді�лав невірний заголовок 'Content-Length'"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP �ервер віді�лав невірний заголовок 'Content-Range'"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "Цей HTTP �ервер має поламану підтримку 'range'"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "�евідомий формат дати"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Погана заголовкова інформаці�"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "З'єднанн� не вдало��"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Внутрішн� помилка"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "В кеші "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Отр:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "Ігн "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Пом "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [Йде робота]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Зміна но�і�: в�тавте ди�к з міткою\n"
+" '%s'\n"
+"у при�трій '%s' і нати�ніть Enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "УВ�Г�: �а�тупні пакунки неможливо автентифікувати!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "�втентифікаційне попередженн� не прийн�то до уваги.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Де�кі пакунки неможливо автентифікувати"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "В�тановити ці пакунки без перевірки?"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Ви�влено проблеми, а опці� -y була викори�тана без --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "�е вдало�� завантажити %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Внутрішн� помилка, InstallPackages була викликана з непрацездатними "
 "пакунками!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "�еобхідно видалити пакунки, але видаленн� заборонене."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутрішн� помилка, Ordering не завершила��"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1196,33 +1293,29 @@ 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
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "Пі�л� цієї операції об'єм зайн�того ди�кового про�тору зменшить�� на %sB.\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "�едо�татньо вільного мі�ц� в %s."
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Ви�влено проблеми, а опці� -y була викори�тана без --force-yes"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Так, робити, �к � �кажу!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1233,19 +1326,19 @@ msgstr ""
 "Щоб продовжити, введіть фразу: '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Перервано."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Де�кі файли не вдало�� завантажити"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1253,19 +1346,19 @@ msgstr ""
 "�еможливо завантажити де�кі архіви, імовірно треба виконати apt-get update "
 "або �пробувати повторити запу�к з ключем --fix-missing?"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing і зміна но�і� в даний момент не підтримуєть��"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "�еможливо виправити втрачені пакунки."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Перериваєть�� в�тановленн�."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1282,15 +1375,15 @@ msgstr[2] ""
 "Вказані пакунки зникли з вашої �и�теми, так �к\n"
 "у�і файли були перезапи�ані іншими пакунками:"
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Увага: це зроблено автоматично і уми�но dpkg'ем."
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "�ам не дозволено видал�ти, неможливо запу�тити AutoRemover"
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1308,15 +1401,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "�а�тупна інформаці� можливо допоможе Вам виправити �итуацію:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутрішн� Помилка, AutoRemover що�ь поламав"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1327,7 +1420,7 @@ msgstr[0] ""
 msgstr[1] "�а�тупні пакунки були в�тановлені автоматично і більше не потрібні:"
 msgstr[2] "�а�тупні пакунки були в�тановлені автоматично і більше не потрібні:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1338,7 +1431,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%lu пакунків було в�тановлено автоматично і вони більше не потрібні.\n"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Викори�товуйте 'apt-get autoremove' щоб видалити його."
@@ -1359,7 +1452,7 @@ msgstr ""
 "�езадоволені залежно�ті. Спробуйте виконати 'apt-get -f install', не "
 "вказуючи назв пакунків (або вкажіть рішенн�)."
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1370,72 +1463,72 @@ msgstr ""
 "або ж викори�товуєте не�табільний ди�трибутив, і запитані Вами пакунки\n"
 "ще не �творені або були вилучені з Incoming."
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Зламані пакунки"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "Будуть в�тановлені на�тупні додаткові пакунки:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Пропоновані пакунки:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Рекомендовані пакунки:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Пропу�каєть�� %s, пакунок вже в�тановлений і опці� О�ОВИТИ не в�тановлена.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Пропу�каєть�� %s, пакунок не в�тановлений, а запитують�� тільки оновленн�.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Перев�тановленн� %s неможливе, бо він не може бути завантаженим.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Вже в�тановлена найновіша вер�і� %s.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Обрана вер�і� '%s' (%s) дл� '%s'\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Обрана вер�і� '%s' (%s) дл� '%s' через '%s'\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Пакунок '%s' не в�тановлений, тому не видалений. Можливо ви мали на увазі "
 "'%s'?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакунок '%s' не в�тановлений, тому не видалений\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1444,137 +1537,120 @@ 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."
+#: 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-get -f install'."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "�езадоволені залежно�ті. Спробуйте викори�тати -f."
+"УВ�Г�: Це тільки �имул�ці�!\n"
+"       apt-get потребує права root дл� реального запу�ку.\n"
+"       Також не забувайте, що блокуванн� вимикаєть��,\n"
+"       тому не очікуйте на відповідні�ть поточній реальній �итуації!"
 
 #: apt-private/private-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [В�тановлено]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [В�тановлено]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [В�тановлено]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [В�тановлено]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакунки, що мають незадоволені залежно�ті:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "але %s вже в�тановлений"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "але %s буде в�тановлений"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "але він не може бути в�тановлений"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "але це віртуальний пакунок"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "але він не в�тановлений"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "але він не буде в�тановлений"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " чи"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакунки, що мають незадоволені залежно�ті:"
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "�ОВІ пакунки, �кі будуть в�тановлені:"
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Пакунки, �кі будуть ВИД�ЛЕ�І:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Пакунки, �кі залишені в незмінному �тані:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "Пакунки, �кі будуть О�ОВЛЕ�І:"
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Пакунки, �кі будуть замінені на СТ�РІШІ вер�ії:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "Пакунки, �кі мали б залишити�� без змін, але будуть замінені:"
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (вна�лідок %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1582,27 +1658,27 @@ msgstr ""
 "УВ�Г�: �а�тупні важливі пакунки будуть вилучені.\n"
 "�Е РОБІТЬ цього, �кщо ви �Е у�вл�єте �обі в�і можливі на�лідки!"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "оновлено %lu, в�тановлено %lu нових, "
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu перев�тановлено, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu замінено на �таріші вер�ії, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu відмічено дл� видаленн� і %lu не оновлено.\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "не в�тановлено(видалено) до кінц� %lu пакунків.\n"
@@ -1611,7 +1687,7 @@ msgstr "не в�тановлено(видалено) до кінц� %lu пак
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1619,37 +1695,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1664,39 +1731,6 @@ msgstr[2] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "УВ�Г�: �а�тупні пакунки неможливо автентифікувати!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "�втентифікаційне попередженн� не прийн�то до уваги.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Де�кі пакунки неможливо автентифікувати"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "В�тановити ці пакунки без перевірки?"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "�е вдало�� завантажити %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1707,74 +1741,45 @@ msgstr "�е вдало�� перейменувати %s на %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Команді update не потрібні аргументи"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Виконано"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "В кеші "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Отр:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ігн "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Пом "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [Йде робота]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Зміна но�і�: в�тавте ди�к з міткою\n"
-" '%s'\n"
-"у при�трій '%s' і нати�ніть Enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "�еможливо прочитати %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1851,37 +1856,439 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Об'єднанн� до�тупної інформації"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode було викликано дл� вузла, що ще викори�товував��"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "�е вдало�� знайти елемент хеша!"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "�еможливо прочитати атрибути %s"
 
-#: apt-inst/filelist.cc:459
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "�еможливо запи�ати в %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "�еможливо визначити вер�ію debconf. Він в�тановлений?"
+
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Спи�ок розширень, припу�тимих дл� пакунків, занадто довгий"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Помилка обробки директорії %s"
+
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr ""
+"Спи�ок розширень, припу�тимих дл� пакунків з вихідними тек�тами, занадто "
+"довгий"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Помилка запи�у заголовка в повний перелік вмі�ту пакунків (Contents)"
+
+#: ftparchive/apt-ftparchive.cc:431
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Помилка обробки повного переліку вмі�ту пакунків (Contents) %s"
+
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Збігів не ви�влено"
+
+#: ftparchive/apt-ftparchive.cc:907
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "У групі пакунків '%s' від�утні де�кі файли"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД була пошкоджена, файл перейменований на %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "БД за�таріла, намагаю�ь оновити %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "�е вдало�� відкрити файл БД %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "�е вдало�� одержати атрибути %s"
+
+#: ftparchive/cachedb.cc:332
 #, fuzzy
-msgid "Failed to allocate diversion"
-msgstr "�е вдало�� �творити diversion"
+msgid "Failed to read .dsc"
+msgstr "�е вдало�� прочитати по�иланн� (readlink) %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Внутрішн� помилка в AddDiversion"
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "В архіві немає запи�у 'control'"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "�рхів не мав пол� 'package'"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
 #, fuzzy, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Спроба перезапи�у diversion, %s -> %s і %s/%s"
+msgid "  %s has no override entry\n"
+msgstr "  Від�утній запи� про перепризначенн� (override) дл� %s\n"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  пакунок %s �упроводжуєть�� %s, а не %s\n"
+
+#: ftparchive/writer.cc:706
 #, fuzzy, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Подвійне додаванн� diversion %s -> %s"
+msgid "  %s has no source override entry\n"
+msgstr "  Від�утній запи� про перепризначенн� вихідних тек�тів дл� %s\n"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/writer.cc:710
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  Крім того, від�утній запи� про бінарне перепризначенн� дл� %s\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - �е вдало�� виділити пам'�ть"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Копі� конфігураційного файлу %s/%s"
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "�е вдало�� перейменувати %s на %s"
+
+#: cmdline/apt-internal-solver.cc:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1908,17 +2315,6 @@ msgstr "Пакунок пробує запи�ати у ціль з diversion %s
 msgid "The diversion path is too long"
 msgstr "Шл�х 'diversion' є занадто довгим"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1948,30 +2344,37 @@ msgstr "Файл %s/%s перезапиÑ�ує інший файл в пакунÐ
 msgid "Unable to stat %s"
 msgstr "�еможливо прочитати атрибути %s"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode було викликано дл� вузла, що ще викори�товував��"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "�е вдало�� закрити файл %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "�е вдало�� знайти елемент хеша!"
 
-#: 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/filelist.cc:459
+#, fuzzy
+msgid "Failed to allocate diversion"
+msgstr "�е вдало�� �творити diversion"
 
-#: apt-inst/deb/debfile.cc:132
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Внутрішн� помилка, не можу знайти �кладову ча�тину %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Внутрішн� помилка в AddDiversion"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Контрольний файл не можливо обробити"
+#: 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:506
+#, fuzzy, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Подвійне додаванн� diversion %s -> %s"
+
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Копі� конфігураційного файлу %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -2020,198 +2423,52 @@ msgstr "Контрольна Ñ�ума tar архіва невірна, архіÐ
 msgid "Unknown TAR header type %u, member %s"
 msgstr "�евідомий тип заголовку TAR - %u, член %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "Виконуєть�� dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Си�тема пакуванн� '%s' не підтримуєть��"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "�еможливо визначити тип необхідної �и�теми пакуванн�"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Запи�ано %i запи�ів.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Запи�ано %i запи�ів з %i від�утніми файлами.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Запи�ано %i запи�ів з %i невідповідними файлам\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "�евірний DEB архів, від�утній член '%s'"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Запи�ано %i запи�ів з %i від�утніми і %i невідповідними файлами\n"
+msgid "Internal error, could not locate member %s"
+msgstr "Внутрішн� помилка, не можу знайти �кладову ча�тину %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "�еможливо знайти аутентифікаційний запи� дл�: %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "Контрольний файл не можливо обробити"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "�евідповідні�ть хешу дл�: %s"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "�е можу обробити чи відкрити перелік пакунків чи �тату�ний файл."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Дл� виправленн� цих помилок Ви можете виконати apt-get update"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "�еможливо прочитати перелік вихідних кодів."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Кеш пакунків пу�тий"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Файл кешу пакунків пошкоджений"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "Файл кешу пакунків має не�умі�ну вер�ію"
-
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Файл кешу пакунків пошкоджений, занадто малий"
+msgid "List directory %spartial is missing."
+msgstr "Від�утн� директорі� зі �пи�ками: %spartial"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Цей APT не підтримує �и�тему призначенн� вер�ій '%s'"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "Кеш пакунків був побудований дл� іншої архітектури"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Залежно�ті (Depends)"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Пре-Залежно�ті (PreDepends)"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Пропонує (Suggests)"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Рекомендує (Recommends)"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Конфлікти (Conflicts)"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Замін�є (Replaces)"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "За�тарілі (Obsoletes)"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Ламає (Breaks)"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Покращує (Enhances)"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "важливі (important)"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "необхідні (required)"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "�тандартні (standard)"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "необов'�зкові (optional)"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "додаткові (extra)"
+msgid "Archives directory %spartial is missing."
+msgstr "Від�утн� директорі� дл� архівів: %spartial"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер дл� метода %s не знайдено."
+msgid "Unable to lock directory %s"
+msgstr "�еможливо заблокувати директорію %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Перевірте, чи в�тановлений пакунок 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s �тартував некоректно"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Будь-ла�ка, в�тавте ди�к з поміткою: '%s' в привід '%s' і нати�ніть Enter."
-
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "Тип '%s' індек�ного файлу не підтримуєть��"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "�е вдало�� відкрити StateFile %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Завантажуєть�� файл %li з %li (залишило�ь %s)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "�е вдало�� запи�ати до тимча�ового StateFile файла %s"
+msgid "Retrieving file %li of %li"
+msgstr "Завантажуєть�� файл %li з %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2231,7 +2488,7 @@ msgstr "�евідповідні�ть розміру"
 msgid "Invalid file format"
 msgstr "�евірна ді� %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2240,16 +2497,16 @@ msgstr ""
 "�еможливо знайти очікуваний запи� '%s' у 'Release' файлі (�евірний запи� у "
 "sources.list, або пошкоджений файл)"
 
-#: apt-pkg/acquire-item.cc:1597
+#: apt-pkg/acquire-item.cc:1589
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "�еможливо знайти хеш-�уму дл� '%s' у 'Release' файлі"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Від�утній публічний ключ дл� заданих ідентифікаторів (ID) ключа:\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2258,12 +2515,12 @@ msgstr ""
 "Файл 'Release' дл� %s за�тарів (недій�ний з %s). Оновленн� дл� цього "
 "репозиторі� не будуть за�то�овані."
 
-#: apt-pkg/acquire-item.cc:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфліктуючий ди�трибутив: %s (очікував�� %s, але є %s)"
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2273,12 +2530,12 @@ msgstr ""
 "попередні індек�ні файли будуть викори�тані. Помилка GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Помилка GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2287,179 +2544,127 @@ msgstr ""
 "Я не зміг знайти файл дл� пакунку %s. Можливо, це значить, що вам потрібно "
 "вла�норуч виправити цей пакунок. (через від�утні�ть 'arch')"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "�еможливо знайти джерело дл� завантаженн� вер�ії '%s' дл� '%s'"
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Індек�ні файли пакунків пошкоджені. �емає пол� 'Filename' дл� пакунку %s."
 
-#: 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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Виникла помилка під ча� обробки %s (%s%d)"
-
-#: 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:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Ого! Ви перевищили кількі�ть вер�ій, �кі APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Ого! Ви перевищили кількі�ть опи�ів, �кі APT може обробити."
+msgid "The method driver %s could not be found."
+msgstr "Драйвер дл� метода %s не знайдено."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Ого! Ви перевищили кількі�ть залежно�тей, �кі APT може обробити."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Перевірте, чи в�тановлений пакунок 'dpkg-dev'.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакунок %s %s не був знайдений під ча� обробки залежно�тей"
+msgid "Method %s did not start correctly"
+msgstr "Метод %s �тартував некоректно"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "�е вдало�� прочитати атрибути переліку вихідних тек�тів %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Будь-ла�ка, в�тавте ди�к з поміткою: '%s' в привід '%s' і нати�ніть Enter."
 
-#: 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/algorithms.cc:265
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Пакунок %s повинен бути перев�тановленим, але � не можу знайти його архів."
 
-#: apt-pkg/pkgcachegen.cc:1316
-#, fuzzy
-msgid "Collecting File Provides"
-msgstr "Збиранн� інформації про 'File Provides'"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути "
+"пов'�зано з зафік�ованими пакунками."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "�еможливо запи�ати в %s"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "�еможливо у�унути проблеми, ви маєте поламані зафік�овані пакунки."
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Помилка IO під ча� збереженн� кешу вихідних тек�тів"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "�е можу обробити чи відкрити перелік пакунків чи �тату�ний файл."
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Блок по�тачальника %s не мі�тить відбитку (fingerprint)"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Дл� виправленн� цих помилок Ви можете виконати apt-get update"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Від�утн� директорі� зі �пи�ками: %spartial"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "�еможливо прочитати перелік вихідних кодів."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Від�утн� директорі� дл� архівів: %spartial"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Випу�к '%s' дл� '%s' не знайдено"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "�еможливо заблокувати директорію %s"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Вер�і� '%s' дл� '%s' не знайдена"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Завантажуєть�� файл %li з %li (залишило�ь %s)"
+msgid "Couldn't find task '%s'"
+msgstr "�еможливо знайти завданн� '%s'"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, c-format
-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 ""
-"Де�кі індек�ні файли не вдало�� завантажити. Вони були зігноровані, або "
-"замі�ть них були викори�тані �таріші вер�ії."
+msgid "Couldn't find any package by regex '%s'"
+msgstr "�еможливо знайти ні�кий пакунок через рег.вираз '%s'"
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Додайте де�кі по�иланн� (URI) на вихідні тек�ти у ваш sources.list"
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "�еможливо знайти ні�кий пакунок через рег.вираз '%s'"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "�еможливо прочитати атрибути %s."
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "�еможливо вибирати вер�ії пакунку '%s', так �к він є чи�то віртуальним"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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)"
+"�еможливо вибрати в�тановлений пакунок, або вер�ію-кандидат пакунку '%s', "
+"так �к вони від�утні"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"�еможливо пр�мо налаштувати конфігурацію на '%s'. Будь-ла�ка, дивіть�� man 5 "
-"apt.conf, нижче APT::Immediate-Configure дл� деталей. (%d)"
+"�еможливо вибрати найновішу вер�ію пакунку '%s', так �к він є чи�то "
+"віртуальним"
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "�еможливо налаштувати '%s'."
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "�еможливо вибрати вер�ію пакунку %s, так �к він не має кандидатів"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"Дл� виконанн� даного в�тановленн� потрібне тимча�ове видаленн� важливого "
-"пакунку %s через петлеві конфлікти/пре-залежно�ті (Pre-Depends loop). Це "
-"погано, але �кщо Ви дій�но бажаєте зробити це, активуйте параметр APT::Force-"
-"LoopBreak."
+"�еможливо вибрати в�тановлену вер�ію пакунку %s, так �к такий пакунок не "
+"в�тановлено"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2543,60 +2748,92 @@ msgstr "Запи�уєть�� новий перелік вихідних тек
 msgid "Source list entries for this disc are:\n"
 msgstr "Перелік вихідних тек�тів дл� цього ди�ка:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Пакунок %s повинен бути перев�тановленим, але � не можу знайти його архів."
+msgid "Unable to stat %s."
+msgstr "�еможливо прочитати атрибути %s."
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути "
-"пов'�зано з зафік�ованими пакунками."
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Побудова дерева залежно�тей"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-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/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "�е вдало�� відкрити StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "�е вдало�� запи�ати до тимча�ового StateFile файла %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 #, fuzzy
 msgid "Send scenario to solver"
 msgstr "Відправити �ценарій розв'�зувачу"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 #, fuzzy
 msgid "Send request to solver"
 msgstr "Відправити запит розв'�зувачу"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 #, fuzzy
 msgid "Prepare for receiving solution"
 msgstr "Пригодувати�� до отриманн� розв'�зку"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 "Зовнішній розв'�зувач завершив�� невдало без відповідного повідомленн� про "
 "помилку"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 #, fuzzy
 msgid "Execute external solver"
 msgstr "Виконати зовнішній розв'�зувач"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "�еможливо проаналізувати файл пакунку %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "Запи�ано %i запи�ів.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "�еможливо проаналізувати файл пакунку %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Запи�ано %i запи�ів з %i від�утніми файлами.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Запи�ано %i запи�ів з %i невідповідними файлам\n"
+
+#: 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 "Запи�ано %i запи�ів з %i від�утніми і %i невідповідними файлами\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "�еможливо знайти аутентифікаційний запи� дл�: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "�евідповідні�ть хешу дл�: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2623,6 +2860,218 @@ msgstr "�евірний запи� 'Valid-Until' у 'Release' файлі %s"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "�евірний запи� 'Date' у 'Release' файлі %s"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Си�тема пакуванн� '%s' не підтримуєть��"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "�еможливо визначити тип необхідної �и�теми пакуванн�"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Виконуєть�� dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "�еможливо налаштувати '%s'."
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Кеш пакунків пу�тий"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "Файл кешу пакунків пошкоджений"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "Файл кешу пакунків має не�умі�ну вер�ію"
+
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Файл кешу пакунків пошкоджений, занадто малий"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Цей APT не підтримує �и�тему призначенн� вер�ій '%s'"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "Кеш пакунків був побудований дл� іншої архітектури"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Залежно�ті (Depends)"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Пре-Залежно�ті (PreDepends)"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Пропонує (Suggests)"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Рекомендує (Recommends)"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Конфлікти (Conflicts)"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Замін�є (Replaces)"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "За�тарілі (Obsoletes)"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Ламає (Breaks)"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Покращує (Enhances)"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "важливі (important)"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "необхідні (required)"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "�тандартні (standard)"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "необов'�зкові (optional)"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "додаткові (extra)"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Ого! Ви перевищили кількі�ть імен пакунків, �кі APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Ого! Ви перевищили кількі�ть вер�ій, �кі APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Ого! Ви перевищили кількі�ть опи�ів, �кі APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Ого! Ви перевищили кількі�ть залежно�тей, �кі APT може обробити."
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "�е вдало�� прочитати атрибути переліку вихідних тек�тів %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
+#, fuzzy
+msgid "Collecting File Provides"
+msgstr "Збиранн� інформації про 'File Provides'"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Помилка IO під ча� збереженн� кешу вихідних тек�тів"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Тип '%s' індек�ного файлу не підтримуєть��"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2700,244 +3149,147 @@ msgstr "�евідомий тип '%s' на р�дку %u в переліку д
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "�евідомий тип '%s' на р�дку %u в переліку джерел %s"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Випу�к '%s' дл� '%s' не знайдено"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Вер�і� '%s' дл� '%s' не знайдена"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "�еможливо знайти завданн� '%s'"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Додайте де�кі по�иланн� (URI) на вихідні тек�ти у ваш sources.list"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "�еможливо знайти ні�кий пакунок через рег.вираз '%s'"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "�еможливо знайти ні�кий пакунок через рег.вираз '%s'"
+msgid "Unable to parse package file %s (1)"
+msgstr "�еможливо проаналізувати файл пакунку %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "�еможливо вибирати вер�ії пакунку '%s', так �к він є чи�то віртуальним"
+msgid "Unable to parse package file %s (2)"
+msgstr "�еможливо проаналізувати файл пакунку %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"�еможливо вибрати в�тановлений пакунок, або вер�ію-кандидат пакунку '%s', "
-"так �к вони від�утні"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"�еможливо вибрати найновішу вер�ію пакунку '%s', так �к він є чи�то "
-"віртуальним"
+"Де�кі індек�ні файли не вдало�� завантажити. Вони були зігноровані, або "
+"замі�ть них були викори�тані �таріші вер�ії."
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "�еможливо вибрати вер�ію пакунку %s, так �к він не має кандидатів"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Блок по�тачальника %s не мі�тить відбитку (fingerprint)"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"�еможливо вибрати в�тановлену вер�ію пакунку %s, так �к такий пакунок не "
-"в�тановлено"
+msgid "Unable to stat the mount point %s"
+msgstr "�еможливо прочитати атрибути точки монтуванн� %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "В�тановлюєть�� %s"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "�е вдало�� прочитати атрибути cdrom"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "�алаштовуєть�� %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "�евідомий параметр командного р�дка '%c' [з %s]."
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "Видал�єть�� %s"
+msgid "Command line option %s is not understood"
+msgstr "�езрозумілий параметр %s командного р�дка"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "Повні�тю видал�єть�� %s"
+msgid "Command line option %s is not boolean"
+msgstr "Параметр %s командного р�дка не є логічного типу 'boolean'"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "Вз�то до відома зникненн� %s"
+msgid "Option %s requires an argument."
+msgstr "Параметр %s потребує аргумента."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Виконуєть�� пі�л�у�тановочний ініціатор %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Опці� %s: Специфікаці� вимагає, щоб р�дки у конфігурації мали вираз =<val>."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Директорі� '%s' від�утн�"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Параметр %s потребує цілочи�лений аргумент, але не '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "�еможливо відкрити файл '%s'"
+msgid "Option '%s' is too long"
+msgstr "Параметр '%s' є занадто довгим"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "Підготовка %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "�езрозумілий вираз %s, �пробуйте true чи false."
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "Розпакуванн� %s"
+msgid "Invalid operation %s"
+msgstr "�евірна ді� %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Підготовка до конфігурації %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "�ерозпізнаваний тип абревіатури: '%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "В�тановлено %s"
+msgid "Opening configuration file %s"
+msgstr "Відкриваєть�� конфігураційний файл %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Підготовка до видаленн� %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Синтак�ична помилка %s:%u: Блок починаєть�� без назви."
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "Видалено %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Синтак�ична помилка %s:%u: �потворений тег"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Підготовка до повного видаленн� %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Синтак�ична помилка %s:%u: зайві �имволи пі�л� величини"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Повні�тю видалено %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr "Операцію було перервано до того, �к вона мала завершити��"
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "проблеми з залежно�т�ми - залишено неналаштованим"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Звіт apport не був запи�аний, тому що повідомленн� про помилку вказує на "
-"від�утні�ть вільного мі�ц� на ди�ку"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Звіт apport не був запи�аний, тому що повідомленн� про помилку вказує на "
-"від�утні�ть вільного мі�ц� у пам'�ті"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Звіт apport не був запи�аний, тому що повідомленн� про помилку вказує на "
-"від�утні�ть вільного мі�ц� на ди�ку"
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Звіт apport не був запи�аний, тому що повідомленн� про помилку вказує на "
-"помилку В/В (I/O) у dpkg"
+"Синтак�ична помилка %s:%u: Директиви можуть бути виконані тільки на "
+"найвищому рівні"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"�еможливо заблокувати адміні�тративну директорію (%s), може її викори�товує "
-"інший проце�?"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Синтак�ична помилка %s:%u: Забагато вмонтованих (nested) включень"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "�еможливо заблокувати адміні�тративну директорію (%s), ви root?"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Синтак�ична помилка %s:%u: Включено звід�и"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+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 ""
-"dpkg було перервано, ви повинні вручну запу�тити '%s' аби виправити "
-"проблему. "
+"Синтак�ична помилка %s:%u: 'clear directive' потребує дерево налаштувань �к "
+"аргумент"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "�е заблоковано"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Синтак�ична помилка %s:%u: Зайве �мітт� в кінці файла"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3057,54 +3409,11 @@ msgstr "Проблема з роз'єднанн�м файла %s"
 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... Виконано"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Вибір %s не знайдено"
+msgid "No keyring installed in %s."
+msgstr "�е в�тановлено 'keyring' у %s."
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3161,534 +3470,236 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Синтак�ична помилка %s:%u: �потворений тег"
+msgid "%c%s... Error!"
+msgstr "%c%s... Помилка!"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Синтак�ична помилка %s:%u: зайві �имволи пі�л� величини"
+msgid "%c%s... Done"
+msgstr "%c%s... Виконано"
 
-#: apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 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
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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'"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Виконано"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Параметр %s потребує аргумента."
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liг %liхв %li�"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-"Опці� %s: Специфікаці� вимагає, щоб р�дки у конфігурації мали вираз =<val>."
+msgid "%lih %limin %lis"
+msgstr "%liг %liхв %li�"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Параметр %s потребує цілочи�лений аргумент, але не '%s'"
+msgid "%limin %lis"
+msgstr "%liхв %li�"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Параметр '%s' є занадто довгим"
+msgid "%lis"
+msgstr "%li�"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "�езрозумілий вираз %s, �пробуйте true чи false."
+msgid "Selection %s not found"
+msgstr "Вибір %s не знайдено"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Спи�ок розширень, припу�тимих дл� пакунків, занадто довгий"
+"�еможливо заблокувати адміні�тративну директорію (%s), може її викори�товує "
+"інший проце�?"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Помилка обробки директорії %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr ""
-"Спи�ок розширень, припу�тимих дл� пакунків з вихідними тек�тами, занадто "
-"довгий"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Помилка запи�у заголовка в повний перелік вмі�ту пакунків (Contents)"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "�еможливо заблокувати адміні�тративну директорію (%s), ви root?"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Помилка обробки повного переліку вмі�ту пакунків (Contents) %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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=?  Вказати довільний параметр конфігурації"
+"dpkg було перервано, ви повинні вручну запу�тити '%s' аби виправити "
+"проблему. "
 
-#: ftparchive/apt-ftparchive.cc:841
-msgid "No selections matched"
-msgstr "Збігів не ви�влено"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "�е заблоковано"
 
-#: ftparchive/apt-ftparchive.cc:919
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "У групі пакунків '%s' від�утні де�кі файли"
+msgid "Installing %s"
+msgstr "В�тановлюєть�� %s"
 
-#: ftparchive/cachedb.cc:65
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД була пошкоджена, файл перейменований на %s.old"
+msgid "Configuring %s"
+msgstr "�алаштовуєть�� %s"
 
-#: ftparchive/cachedb.cc:83
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "БД за�таріла, намагаю�ь оновити %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"�евірний формат БД. Якщо ви оновили�� зі �тарої вер�ії apt, будь-ла�ка "
-"видаліть і наново �творіть базу-даних."
+msgid "Removing %s"
+msgstr "Видал�єть�� %s"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "�е вдало�� відкрити файл БД %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "�е вдало�� прочитати по�иланн� (readlink) %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "В архіві немає запи�у 'control'"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "�еможливо одержати кур�ор"
+msgid "Completely removing %s"
+msgstr "Повні�тю видал�єть�� %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "У: �е вдало�� прочитати директорію %s\n"
+msgid "Noting disappearance of %s"
+msgstr "Вз�то до відома зникненн� %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, 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 "П: Помилки відно��ть�� до файлу "
+msgid "Running post-installation trigger %s"
+msgstr "Виконуєть�� пі�л�у�тановочний ініціатор %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "�е вдало�� визначити %s"
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "�е вдало�� зробити обхід дерева"
+msgid "Directory '%s' missing"
+msgstr "Директорі� '%s' від�утн�"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to open %s"
-msgstr "�е вдало�� відкрити %s"
+msgid "Could not open file '%s'"
+msgstr "�еможливо відкрити файл '%s'"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "DeLink %s [%s]\n"
+msgid "Preparing %s"
+msgstr "Підготовка %s"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "�е вдало�� прочитати по�иланн� (readlink) %s"
+msgid "Unpacking %s"
+msgstr "Розпакуванн� %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "�е вдало�� видалити по�иланн� (unlink) %s"
+msgid "Preparing to configure %s"
+msgstr "Підготовка до конфігурації %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** �е вдало�� �творити по�иланн� %s на %s"
+msgid "Installed %s"
+msgstr "В�тановлено %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Перевищено ліміт в %sB в DeLink.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "�рхів не мав пол� 'package'"
-
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
-#, fuzzy, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Від�утній запи� про перепризначенн� (override) дл� %s\n"
+msgid "Preparing for removal of %s"
+msgstr "Підготовка до видаленн� %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  пакунок %s �упроводжуєть�� %s, а не %s\n"
-
-#: ftparchive/writer.cc:706
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Від�утній запи� про перепризначенн� вихідних тек�тів дл� %s\n"
-
-#: ftparchive/writer.cc:710
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Крім того, від�утній запи� про бінарне перепризначенн� дл� %s\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - �е вдало�� виділити пам'�ть"
+msgid "Removed %s"
+msgstr "Видалено %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "Підготовка до повного видаленн� %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "Повні�тю видалено %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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 необхідно ввімкнути �ти�ненн�"
+msgid "Can not write log (%s)"
+msgstr "�еможливо запи�ати в %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "�е вдало�� �творити FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "�е вдало�� породити проце� (fork)"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Проце�-нащадок, що виконує пакуванн�"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr "Операцію було перервано до того, �к вона мала завершити��"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Внутрішн� помилка, не вдало�� �творити %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Звіт apport не був запи�аний, тому що параметр MaxReports вже до��гнув "
+"мак�имальної величини"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Помилка уведенн�/виводу в підпроце�/файл"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "проблеми з залежно�т�ми - залишено неналаштованим"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Помилка зчитуванн� під ча� обчи�ленн� MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Звіт apport не був запи�аний, тому що повідомленн� про помилку вказує на те, "
+"що ц� помилка є на�лідком попередньої невдачі."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "�е вдало�� видалити %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Звіт apport не був запи�аний, тому що повідомленн� про помилку вказує на "
+"від�утні�ть вільного мі�ц� на ди�ку"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"Звіт apport не був запи�аний, тому що повідомленн� про помилку вказує на "
+"від�утні�ть вільного мі�ц� у пам'�ті"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "�евідомий запи� про пакунок!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Звіт apport не був запи�аний, тому що повідомленн� про помилку вказує на "
+"від�утні�ть вільного мі�ц� на ди�ку"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"Звіт apport не був запи�аний, тому що повідомленн� про помилку вказує на "
+"помилку В/В (I/O) у dpkg"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Внутрішн� помилка, AllUpgrade що�ь поламав"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s не є правильним DEB пакунком."
diff --git a/po/vi.po b/po/vi.po
index 69a9ca5e7..1100281eb 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.2\n"
+"Project-Id-Version: apt 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-28 09:24+0700\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\n"
+"PO-Revision-Date: 2014-07-24 14:58+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"
@@ -101,76 +101,76 @@ msgstr "Tổng chỗ đã tính dành cho: "
 msgid "Package file %s is out of sync."
 msgstr "Tập tin gói %s không đồng bộ được."
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 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:1420
+#: cmdline/apt-cache.cc:1421
 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:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Không thể định vị gói %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "Tập tin gói:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "Các gói đã ghim:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(không tìm thấy)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  �ã cài đặt: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  Ứng cử: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(không)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  Ghim gói: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  Bảng phiên bản:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -339,7 +339,7 @@ msgid "Couldn't find package %s"
 msgstr "Không tìm thấy gói %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s được đặt thành “được cài đặt bằng tay�.\n"
@@ -369,7 +369,7 @@ msgstr "Không thể khoá thư mục tải v�"
 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:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Không tìm thấy gói nguồn cho %s"
@@ -401,7 +401,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "�ang b� qua tập tin đã được tải v� “%s�\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Không thể tìm được chỗ trống trong %s"
@@ -434,7 +434,7 @@ msgstr "Lấy mã nguồn %s\n"
 msgid "Failed to fetch some archives."
 msgstr "Gặp lỗi khi lấy một số kho."
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 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�"
 
@@ -443,31 +443,31 @@ msgstr "Hoàn tất việc tải v� và trong chế độ chỉ tải v�"
 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:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Lệnh giải nén “%s� bị lỗi.\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, 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:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Lệnh biên dịch “%s� bị lỗi.\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "Tiến trình con bị lỗi"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 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:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -476,17 +476,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:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, 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:1101
+#: cmdline/apt-get.cc:1102
 #, 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:1271
+#: cmdline/apt-get.cc:1272
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -495,7 +495,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:1289
+#: cmdline/apt-get.cc:1290
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -503,14 +503,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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -519,7 +519,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:1357
+#: cmdline/apt-get.cc:1358
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -528,30 +528,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:1380
+#: cmdline/apt-get.cc:1381
 #, 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:1395
+#: cmdline/apt-get.cc:1396
 #, 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:1400
+#: cmdline/apt-get.cc:1401
 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:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog cho %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "Hỗ trợ các mô-đun:"
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -645,15 +645,20 @@ 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-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 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:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr "Gặp lỗi khi tải v�"
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
+#, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -662,6 +667,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -700,8 +706,9 @@ msgstr "%s đã sẵn được đặt là giữ lại.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s đã sẵn được đặt là không giữ lại.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Cần %s nhưng mà không thấy nó ở đây"
@@ -940,7 +947,7 @@ msgstr "Không thể tạo ổ cắm"
 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:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Gặp lỗi"
 
@@ -986,7 +993,7 @@ msgstr "Quá gi� kết nối ổ cắm dữ liệu"
 msgid "Unable to accept connection"
 msgstr "Không thể chấp nhận kết nối"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Gặp vấn đ� băm tập tin"
 
@@ -1118,138 +1125,224 @@ msgstr ""
 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:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 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:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "Gặp lỗi khi đ�c từ máy phục vụ"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "Việc ch�n bị lỗi"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "Kết nối đã quá gi�"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "Gặp lỗi khi ghi vào tập tin đầu ra"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "�ang đợi phần đầu dữ liệu..."
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "Dòng đầu sai"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 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:171
+#: methods/server.cc:172
 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:194
+#: methods/server.cc:195
 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:196
+#: methods/server.cc:197
 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:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "Không rõ định dạng ngày"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "Dữ liệu phần đầu sai"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Kết nối bị lỗi"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Tìm thấy "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "Lấy:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "B�q "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "Lá»—i "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [�ang hoạt động]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Chuyển đổi thiết bị lưu trữ: vui lòng đưa đĩa có nhãn\n"
+" “%s�\n"
+"vào ổ “%s� rồi bấm nút Enter\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr "�ang sắp xếp"
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "CẢNH B�O: Không thể xác thực những gói sau đây!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Cảnh báo xác thực bị đè.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+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:50
+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:59 apt-private/private-install.cc:210
+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-download.cc:91 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-install.cc:82
 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:90
+#: apt-private/private-install.cc:91
 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à tính năng Gỡ b� (Remove) đã bị tắt."
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 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:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, 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:199
+#: apt-private/private-install.cc:200
 #, 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:209 apt-private/private-download.cc:59
-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:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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 "
@@ -1257,11 +1350,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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Có, làm đi!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1272,19 +1365,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:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Hủy b�."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Bạn có muốn tiếp tục không?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "Một số tập tin không tải v� được"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1293,20 +1386,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:323
+#: apt-private/private-install.cc:324
 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:328
+#: apt-private/private-install.cc:329
 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:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "�ang hủy b� tiến trình cài đặt."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1317,15 +1410,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:369
+#: apt-private/private-install.cc:370
 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:390
+#: apt-private/private-install.cc:391
 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:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1343,15 +1436,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 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:505
+#: apt-private/private-install.cc:506
 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:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1360,14 +1453,14 @@ 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:516
+#: apt-private/private-install.cc:517
 #, 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:518
+#: apt-private/private-install.cc:519
 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."
@@ -1384,7 +1477,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:628
+#: apt-private/private-install.cc:638
 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"
@@ -1396,202 +1489,186 @@ 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:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Gói bị h�ng"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 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:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "Các gói đ� nghị:"
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "Gói khuyến khích:"
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "�ang b� qua %s vì nó đã được cài đặt và chưa đặt tùy ch�n Nâng cấp.\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "�ang b� qua %s vì nó chưa được cài đặt và chỉ Nâng cấp là được yêu cầu.\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Không thể cài đặt lại %s vì không thể tải nó v�.\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s là phiên bản mới nhất.\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "�ã ch�n phiên bản “%s� (%s) cho “%s�\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "�ã ch�n phiên bản “%s� (%s) cho “%s� vì “%s�\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "Chưa cài đặt gói %s nên không thể gỡ b� nó. Có phải ý bạn là “%s'?\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Gói %s chưa được cài đặt, thế nên không thể gỡ b� nó\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr "�ang liệt kê"
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr "không hiểu"
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr "[đã cài, có thể nâng cấp thành: %s]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 msgid "[installed,local]"
 msgstr "[đã cài đặt,nội bộ]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr "[đã cài,có thể tự động gỡ b�]"
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 msgid "[installed,automatic]"
 msgstr "[đã cài đặt,tự động]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 msgid "[installed]"
 msgstr "[đã cài đặt]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr "[có thể nâng cấp từ: %s]"
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr "[residual-config]"
 
-#: apt-private/private-output.cc:352
-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:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "nhưng mà %s đã được cài đặt"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "nhưng mà %s sẽ được cài đặt"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 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:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "nhưng mà nó là gói ảo"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "nhưng mà nó không được cài đặt"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 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:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " hay"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+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:523
 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:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "Những gói sau sẽ bị GỠ BỎ:"
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "Những gói sau đây được giữ lại:"
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 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:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 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:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (bởi vì %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1599,27 +1676,27 @@ 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:694
+#: apt-private/private-output.cc:727
 #, 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:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu được cài đặt lại, "
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu bị hạ cấp, "
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, 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:706
+#: apt-private/private-output.cc:739
 #, 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"
@@ -1628,7 +1705,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ b�.\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr "[C/k]"
 
@@ -1636,35 +1713,28 @@ msgstr "[C/k]"
 #. 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:734
+#: apt-private/private-output.cc:767
 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:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr "C"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr "K"
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "Tìm kiếm toàn văn"
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1677,39 +1747,6 @@ msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chá»�n “-aâ
 msgid "not a real package (virtual)"
 msgstr "không là gói thật (ảo)"
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "CẢNH B�O: Không thể xác thực những gói sau đây!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Cảnh báo xác thực bị đè.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-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:50
-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:91 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-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1720,73 +1757,44 @@ msgstr "Gặp lỗi khi phân tích %s. Sửa lại chứ? "
 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/private-search.cc:51
-msgid "Full Text Search"
-msgstr "Tìm kiếm toàn văn"
+#: 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-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i gói có thể được cập nhật. Chạy 'apt list --upgradable' để xem chúng.\n"
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr "M�i gói đã được cập nhật."
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "Xong"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Tìm thấy "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Lấy:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "B�q "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Lá»—i "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [�ang hoạt động]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Chuyển đổi thiết bị lưu trữ: vui lòng đưa đĩa có nhãn\n"
-" “%s�\n"
-"vào ổ “%s� rồi bấm nút Enter\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "Không thể đ�c %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1860,36 +1868,448 @@ msgstr ""
 msgid "Merging available information"
 msgstr "�ang hòa trộn các thông tin sẵn có..."
 
-#: 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"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Gặp lỗi khi định vị phần tử băm!"
+#: 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"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Gặp lỗi khi định vị trệch đi"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Không thể ghi vào %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Danh sách mở rộng gói quá dài"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, 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"
+msgid "Error processing directory %s"
+msgstr "Gặp lỗi khi xử lý thư mục %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Danh sách mở rộng nguồn quá dài"
+
+#: ftparchive/apt-ftparchive.cc:401
+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:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Sự trệch đi được thêm hai lần %s → %s"
+msgid "Error processing contents %s"
+msgstr "Gặp lỗi khi xử lý nội dung %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "Không có cái được ch�n khớp được"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s"
+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:65
+#, 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:83
+#, 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:94
+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:99
+#, 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:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, 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:332
+msgid "Failed to read .dsc"
+msgstr "Gặp lỗi khi đ�c .dsc"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Kho không có mục ghi đi�u khiển"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "Kho không có trư�ng gói"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s không có mục ghi đè (override)\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, 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:706
+#, 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:710
+#, 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:351 ftparchive/contents.cc:382
+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"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, 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:49
+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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1915,17 +2335,6 @@ msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s"
 msgid "The diversion path is too long"
 msgstr "�ư�ng dẫn trệch đi quá dài"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1954,30 +2363,36 @@ msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s"
 msgid "Unable to stat %s"
 msgstr "Không thể lấy thông tin thống kê %s"
 
-#: 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/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/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/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Gặp lỗi khi định vị phần tử băm!"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Gặp lỗi khi định vị trệch đi"
+
+#: 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:477
 #, 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�"
+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/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Gặp lỗi nội bộ, không thể định vị thành viên %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Sự trệch đi được thêm hai lần %s → %s"
 
-#: 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-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/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -2025,201 +2440,52 @@ msgstr "Gặp lỗi khi tổng kiểm “tar�, kho bị h�ng"
 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/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr "Diễn biến: [%3i%%]"
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "�ang chạy dpkg"
-
-#: apt-pkg/init.cc:146
-#, 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: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/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "�ã ghi %i bản ghi.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, 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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
-#, 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"
-
-#: 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 ""
-"�ã 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/indexcopy.cc:515
-#, 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"
-
-#: apt-pkg/indexcopy.cc:521
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Sai khớp chuỗi duy nhất cho: %s"
-
-#: 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/cachefile.cc:98
-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:116
-msgid "The list of sources could not be read."
-msgstr "Không thể đ�c danh sách nguồn."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Bộ nhớ tạm gói trống"
-
-#: 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: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: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�"
+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-pkg/pkgcache.cc:174
+#: apt-inst/deb/debfile.cc:132
 #, 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: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:321
-msgid "Depends"
-msgstr "Phụ thuộc"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Phụ thuộc sẵn"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "�� nghị"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Khuyến khích"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Xung Ä‘á»™t"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Thay thế"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "CÅ©"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "Làm h�ng"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "Tăng cư�ng"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "quan tr�ng"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "yêu cầu"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "chuẩn"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "tùy ch�n"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "bổ sung"
+msgid "Internal error, could not locate member %s"
+msgstr "Gặp lỗi nội bộ, không thể định vị thành viên %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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-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/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "Gói “%s� đã được cài đặt chưa?"
+msgid "List directory %spartial is missing."
+msgstr "Thiếu thư mục danh sách %spartial."
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "Phương thức %s đã không khởi chạy đúng đắn."
+msgid "Archives directory %spartial is missing."
+msgstr "Thiếu thư mục kho lưu %spartial."
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire.cc:99
 #, 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."
+msgid "Unable to lock directory %s"
+msgstr "Không thể khoá thư mục %s"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, 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/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ử"
+msgid "Clean of %s is not supported"
+msgstr "Không hỗ trợ việc xóa %s"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Lỗi mở tập tin tình trạng StateFile %s"
+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/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, 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"
+msgid "Retrieving file %li of %li"
+msgstr "�ang tải tập tin %li trong tổng số %li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2238,7 +2504,7 @@ msgstr "Kích cỡ không khớp nhau"
 msgid "Invalid file format"
 msgstr "�ịnh dạng tập tập tin không hợp lệ"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2247,16 +2513,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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, 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:1639
+#: apt-pkg/acquire-item.cc:1631
 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:1677
+#: apt-pkg/acquire-item.cc:1669
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2265,12 +2531,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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, 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:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2281,12 +2547,12 @@ msgstr ""
 "Lá»—i GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Lá»—i GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2295,12 +2561,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:1933
+#: apt-pkg/acquire-item.cc:1925
 #, 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:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2308,168 +2574,113 @@ 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/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: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
+#: apt-pkg/acquire-worker.cc:116
 #, 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: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: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ý."
+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/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/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Gói “%s� đã được cài đặt chưa?"
 
-#: 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/acquire-worker.cc:169
+#, 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/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, 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"
+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/pkgcachegen.cc:1211
+#: apt-pkg/algorithms.cc:265
 #, 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"
+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/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/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/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "�ang tập hợp các Nhà cung cấp Tập tin"
+#: 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/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/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/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/cachefile.cc:98
+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/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Khối nhà bán %s không chứa vân tay"
+#: 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/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "List directory %spartial is missing."
-msgstr "Thiếu thư mục danh sách %spartial."
+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/acquire.cc:91
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Thiếu thư mục kho lưu %spartial."
+msgid "Version '%s' for '%s' was not found"
+msgstr "Không tìm thấy phiên bản “%s� cho “%s�"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Không thể khoá thư mục %s"
+msgid "Couldn't find task '%s'"
+msgstr "Không tìm thấy tác vụ “%s�"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:609
 #, 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)"
+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/acquire.cc:901
+#: apt-pkg/cacheset.cc:615
 #, 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 ""
-"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)"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Không tìm thấy gói nào theo đư�ng dẫn “%s�"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Không thể lấy trạng thái v� %s."
+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/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, 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:422
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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:444
-#, c-format
-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"
+"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/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:647
 #, 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)"
+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/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Could not configure '%s'. "
-msgstr "Không thể cấu hình “%s�. "
+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/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 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)."
+"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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2552,53 +2763,88 @@ msgstr "�ang ghi danh sách nguồn mới\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Các mục tin danh sách nguồn cho đĩa này:\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, 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ó."
+msgid "Unable to stat %s."
+msgstr "Không thể lấy trạng thái v� %s."
 
-#: 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/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/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: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/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "Lỗi mở tập tin tình trạng StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, 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/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr "Gửi kịch bản đến bộ phân giải"
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr "Gửi yêu cầu đến bộ phân giải"
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr "Chuẩn bị để lấy cách giải quyết"
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 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:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr "Thi hành bộ phân giải từ bên ngoài"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, 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)"
+msgid "Wrote %i records.\n"
+msgstr "�ã ghi %i bản ghi.\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, 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)"
+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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, 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"
+
+#: 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 ""
+"�ã 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/indexcopy.cc:515
+#, 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"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Sai khớp chuỗi duy nhất cho: %s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2628,6 +2874,218 @@ 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/init.cc:146
+#, 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: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/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr "Diễn biến: [%3i%%]"
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "�ang chạy dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Không thể cấu hình “%s�. "
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "Bộ nhớ tạm gói trống"
+
+#: 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: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: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: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: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:321
+msgid "Depends"
+msgstr "Phụ thuộc"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Phụ thuộc sẵn"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "�� nghị"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Khuyến khích"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Xung Ä‘á»™t"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Thay thế"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "CÅ©"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Làm h�ng"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "Tăng cư�ng"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "quan tr�ng"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "yêu cầu"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "chuẩn"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "tùy ch�n"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "bổ sung"
+
+#: 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: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: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: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: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: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: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: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: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:1316
+msgid "Collecting File Provides"
+msgstr "�ang tập hợp các Nhà cung cấp Tập tin"
+
+#: 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/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/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 ""
+"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:422
+#, 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:444
+#, c-format
+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/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2712,238 +3170,145 @@ msgstr "Không biết kiểu “%s� trên dòng %u trong danh sách nguồn %s
 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/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: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:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Không tìm thấy tác vụ “%s�"
-
-#: 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/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/cacheset.cc:615
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Không tìm thấy gói nào theo đư�ng dẫn “%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/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, 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"
+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:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 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: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"
+"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/cacheset.cc:655
+#: apt-pkg/vendorlist.cc:85
 #, 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ử"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Khối nhà bán %s không chứa vân tay"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/cdromutl.cc:65
 #, 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"
+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/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
-msgstr "�ang cài đặ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/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Configuring %s"
-msgstr "�ang cấu hình %s"
+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/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Removing %s"
-msgstr "�ang gỡ b� %s"
+msgid "Command line option %s is not understood"
+msgstr "Không hiểu tùy ch�n dòng lệnh %s"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Completely removing %s"
-msgstr "�ang gỡ b� hoàn toàn %s"
+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/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "�ang ghi chép sự biến mất của %s"
+msgid "Option %s requires an argument."
+msgstr "Tùy ch�n %s yêu cầu một đối số."
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "�ang chạy bẫy sau-cài-đặt %s"
+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ị>�."
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Thiếu thư mục “%s�"
+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/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "Không thể mở tập tin “%s�"
+msgid "Option '%s' is too long"
+msgstr "Tùy ch�n “%s� quá dài"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Preparing %s"
-msgstr "�ang chuẩn bị %s"
+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/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Unpacking %s"
-msgstr "�ang mở gói %s"
+msgid "Invalid operation %s"
+msgstr "Thao tác “%s� không hợp lệ"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "�ang chuẩn bị cấu hình %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Không chấp nhận kiểu viết tắt: “%c�"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Installed %s"
-msgstr "�ã cài đặt %s"
+msgid "Opening configuration file %s"
+msgstr "�ang mở tập tin cấu hình %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "�ang chuẩn bị gỡ b� %s"
+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/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Removed %s"
-msgstr "�ã gỡ b� %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "�ang chuẩn bị gỡ b� hoàn toàn %s"
+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/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Completely removed %s"
-msgstr "Gỡ b� hoàn toàn %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr "ioctl(TIOCGWINSZ) gặp lỗi"
+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/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Can not write log (%s)"
-msgstr "Không thể ghi nhật ký (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1069
-msgid "Is /dev/pts mounted?"
-msgstr "/dev/pts đã gắn chưa?"
-
-#: 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:1569
-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:1631
-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:1636
-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:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-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:1644
-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:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"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 “không đủ "
-"bộ nhớ�"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-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:1685
-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�"
+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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-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?"
+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/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, 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?"
+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�"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 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. "
+"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/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Chưa được khoá"
+#: 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"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -3062,54 +3427,11 @@ msgstr "Gặp vấn đ� khi b� liên kết tập tin %s"
 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%%"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "Không tìm thấy vùng ch�n %s"
+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/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3166,541 +3488,234 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, 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)"
+msgid "%c%s... Error!"
+msgstr "%c%s... Lá»—i!"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Tùy ch�n %s yêu cầu một đối số."
+msgid "%c%s... Done"
+msgstr "%c%s... Xong"
 
-#: 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/progress.cc:181
+msgid "..."
+msgstr "..."
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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�"
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Tùy ch�n “%s� quá dài"
+msgid "%lid %lih %limin %lis"
+msgstr "%li ngày %li gi� %li phút %li giây"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, 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)."
+msgid "%lih %limin %lis"
+msgstr "%li gi� %li phút %li giây"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, 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"
+msgid "%limin %lis"
+msgstr "%li phút %li giây"
 
-#: cmdline/apt-extracttemplates.cc:254
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Danh sách mở rộng gói quá dài"
+msgid "%lis"
+msgstr "%li giây"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Gặp lỗi khi xử lý thư mục %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Danh sách mở rộng nguồn quá dài"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung"
+msgid "Selection %s not found"
+msgstr "Không tìm thấy vùng ch�n %s"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Gặp lỗi khi xử lý nội dung %s"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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:841
-msgid "No selections matched"
-msgstr "Không có cái được ch�n khớp được"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, 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�."
+"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?"
 
-#: ftparchive/cachedb.cc:65
+#: apt-pkg/deb/debsystem.cc:94
 #, 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ũ)."
+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?"
 
-#: ftparchive/cachedb.cc:83
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, 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:94
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:99
-#, 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:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Gặp lỗi khi đ�c liên kết %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Kho không có mục ghi đi�u khiển"
-
-#: ftparchive/cachedb.cc:594
-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"
+"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. "
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Việc di chuyển qua cây bị lỗi"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Chưa được khoá"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Failed to open %s"
-msgstr "Gặp lỗi khi mở %s"
+msgid "Installing %s"
+msgstr "�ang cài đặt %s"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " B� liên kết %s [%s]\n"
+msgid "Configuring %s"
+msgstr "�ang cấu hình %s"
 
-#: ftparchive/writer.cc:286
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Gặp lỗi khi đ�c liên kết %s"
+msgid "Removing %s"
+msgstr "�ang gỡ b� %s"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Việc b� liên kết %s bị lỗi"
+msgid "Completely removing %s"
+msgstr "�ang gỡ b� hoàn toàn %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Gặp lỗi khi liên kết %s đến %s"
+msgid "Noting disappearance of %s"
+msgstr "�ang ghi chép sự biến mất của %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:100
 #, 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:417
-msgid "Archive had no package field"
-msgstr "Kho không có trư�ng gói"
+msgid "Running post-installation trigger %s"
+msgstr "�ang chạy bẫy sau-cài-đặt %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s không có mục ghi đè (override)\n"
+msgid "Directory '%s' missing"
+msgstr "Thiếu thư mục “%s�"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, 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"
+msgid "Could not open file '%s'"
+msgstr "Không thể mở tập tin “%s�"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s không có mục ghi đè (override) nguồn\n"
+msgid "Preparing %s"
+msgstr "�ang chuẩn bị %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:993
 #, 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:351 ftparchive/contents.cc:382
-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"
+msgid "Unpacking %s"
+msgstr "�ang mở gói %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:998
 #, 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)"
+msgid "Preparing to configure %s"
+msgstr "�ang chuẩn bị cấu hình %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Việc đ�c tập tin đè %s bị lỗi"
+msgid "Installed %s"
+msgstr "�ã cài đặt %s"
 
-#: ftparchive/override.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Sai override %s dòng %llu #1"
+msgid "Preparing for removal of %s"
+msgstr "�ang chuẩn bị gỡ b� %s"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Sai override %s dòng %llu #2"
+msgid "Removed %s"
+msgstr "�ã gỡ b� %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Sai override %s dòng %llu #3"
+msgid "Preparing to completely remove %s"
+msgstr "�ang chuẩn bị gỡ b� hoàn toàn %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Không biết thuật toán nén “%s�"
+msgid "Completely removed %s"
+msgstr "Gỡ b� hoàn toàn %s"
 
-#: ftparchive/multicompress.cc:103
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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"
+msgid "Can not write log (%s)"
+msgstr "Không thể ghi nhật ký (%s)"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Việc tạo TẬP_TIN* bị lỗi"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr "/dev/pts đã gắn chưa?"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Gặp lỗi khi rẽ nhánh tiến trình"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr "�ầu ra là thiết bị cuối?"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Nén con"
+#: apt-pkg/deb/dpkgpm.cc:1625
+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"
 
-#: 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"
+#: apt-pkg/deb/dpkgpm.cc:1687
+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)"
 
-#: 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"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+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"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Gặp lỗi khi đ�c trong khi tính MD5"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+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 đó."
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gặp lỗi khi b� liên kết %s"
+#: apt-pkg/deb/dpkgpm.cc:1700
+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�"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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"
+"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ớ�"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Không hiểu bản ghi gói!"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+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ộ"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+"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�"
+
+#~ msgid "ioctl(TIOCGWINSZ) failed"
+#~ msgstr "ioctl(TIOCGWINSZ) gặp lỗi"
+
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Lỗi nội bộ: Lệnh nâng cấp đã làm h�ng thứ gì đó"
 
 #~ 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 e7e1b3cfe..67e69f716 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,11 +9,11 @@ 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+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"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,74 +98,74 @@ msgstr "总�用空间："
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未�步。"
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr "您必须明确地给出至少一个表达�"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "未�现软件包 %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "软件包文件："
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "被�定的软件包："
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(没有找到)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  已安装："
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  候选软件包："
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(æ— )"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  软件包�："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -327,7 +327,7 @@ msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
@@ -355,7 +355,7 @@ msgstr "无法�定下载目录"
 msgid "Must specify at least one package to fetch source for"
 msgstr "�下载�代�，必须指定至少一个对应的软件包"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的�代�包"
@@ -386,7 +386,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s�\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的�用空间"
@@ -419,7 +419,7 @@ msgstr "下载�代� %s\n"
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目�是“仅下载�模�"
 
@@ -428,66 +428,66 @@ msgstr "下载完毕，目�是“仅下载�模�"
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "忽略已�被解包到 %s 目录的�代�包\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "�行解包的命令“%s�出错。\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是�安装了“dpkg-dev�软件包。\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s�失败。\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "�进程出错"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr "�检查生�软件包的构建�赖关系，必须指定至少一个软件包"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建�赖关系信�"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建�赖关系信�。\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, 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:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,37 +496,37 @@ msgstr ""
 "由于无法找到符��求的软件包 %3$s 的�用版本，因此�能满足 %2$s 所�求的 "
 "%1$s �赖关系"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, 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:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所�求 %1$s �赖关系：%3$s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "�能满足软件包 %s 所�求的构建�赖关系。"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "无法处�构建�赖关系"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "正在连接 %s (%s)"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "支�的模�："
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -614,16 +614,20 @@ msgstr ""
 "以获�更多信�和选项。\n"
 "                       本 APT 具有超级牛力。\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "�下载�代�，必须指定至少一个对应的软件包"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -632,6 +636,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -661,8 +666,9 @@ msgstr "%s 已�是最新的版本了。\n"
 msgid "%s was already not hold.\n"
 msgstr "%s 已�是最新的版本了。\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待�进程 %s 的退出，但是它并�存在"
@@ -855,7 +861,7 @@ msgstr "无法创建套接字"
 msgid "Could not connect data socket, connection timed out"
 msgstr "无法连接上数�套接字，连接超时"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "失败"
 
@@ -901,7 +907,7 @@ msgstr "数�套接字连接超时"
 msgid "Unable to accept connection"
 msgstr "无法接�连接"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "把文件加入哈希表时出错"
 
@@ -1029,142 +1035,228 @@ msgstr "由于没有公钥，无法验�下列签�：\n"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从�务器读�数�时出错，对方关闭了连接"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "从�务器读�数�出错"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "select 调用出错"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "错误的报头行"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 HTTP �务器��了一个无效的应答报头"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 HTTP �务器��了一个无效的 Content-Length 报头"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 HTTP �务器��了一个无效的 Content-Range 报头"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "该 HTTP �务器的 range 支��正常"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "无法识别的日期格�"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "错误的报头数�"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "内部错误"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "命中 "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "获�："
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "忽略 "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "错误 "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [执行中]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"更�介质：请把标有\n"
+"“%s�\n"
+"的盘片�入驱动器“%s��按回车键\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "�警告】：下列软件包�能通过验��"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "忽略了认�警告。\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "有些软件包�能通过验�"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "��验�就安装这些软件包�？"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "无法下载 %s  %s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上�"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需�被�载，但是�载动作被程�设置所�止。"
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 未能完�"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "解压缩�将会空出 %sB 的空间。\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "您在 %s 上没有足够的�用空间。"
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "是，按我说的��"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1175,19 +1267,19 @@ msgstr ""
 "若还想继续的�，就输入下�的短�“%s�\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "中止执行。"
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "您希望继续执行�？"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "有一些文件无法下载"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1195,19 +1287,19 @@ msgstr ""
 "有几个软件包无法下载，您�以�行 apt-get update 或者加上 --fix-missing 的选项"
 "�试试？"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目�还�支� --fix-missing 和介质交�"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "无法更正缺少的软件包。"
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "中止安装。"
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1216,15 +1308,15 @@ msgid_plural ""
 "all files have been overwritten by other packages:"
 msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "注�：这是自动被 dpkg 有�完�的。"
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我们�应该进行删除，无法�动自动删除器"
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1240,15 +1332,15 @@ msgstr "似乎自动�载工具��了一些软件，这�应该�生。请
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "下列信��能会对解决问题有所帮助："
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动�载工具�事了"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1256,14 +1348,14 @@ msgid_plural ""
 "required:"
 msgstr[0] "下列软件包是自动安装的并且现在�需�了："
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, 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:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1281,7 +1373,7 @@ msgstr ""
 "有未能满足的�赖关系。请�试�指明软件包的�字��行“apt-get -f install�(也�"
 "以指定一个解决办法)。"
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1292,204 +1384,187 @@ msgstr ""
 "因为系统无法达到您�求的状�造�的。该版本中�能会有一些您需�的软件\n"
 "包尚未被创建或是它们已被从新到(Incoming)目录移出。"
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "破�的软件包"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列�外的软件包："
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "推�安装的软件包："
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略了 %s，它已�被安装而且没有指定��级。\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "忽略了 %s，它已�被安装而且仅请求了�级。\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "�能�新安装 %s，因为无法下载它。\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 已�是最新的版本了。\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "软件包 %s 还未安装，因而�会被�载\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "软件包 %s 还未安装，因而�会被�载\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [已安装]"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [已安装]"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [已安装]"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr " [已安装]"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的�赖关系："
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "但是 %s 已�安装"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是 %s 正�被安装"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "但无法安装它"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "但是它是虚拟软件包"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "但是它还没有被安装"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "但是它将�会被安装"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr " 或"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的�赖关系："
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "下列�新】软件包将被安装："
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "下列软件包将被��载】："
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "下列软件包的版本将����："
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "下列软件包将被�级："
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列软件包将被��级】："
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "下列被�求��版本��的软件包将被改�："
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1497,27 +1572,27 @@ msgstr ""
 "�警告】：下列基础软件包将被�载。\n"
 "请勿�试，除�您确实知�您在�什么�"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "�级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "�新安装了 %lu 个软件包，"
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "�级了 %lu 个软件包，"
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "��载 %lu 个软件包，有 %lu 个软件包未被�级。\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或�载。\n"
@@ -1526,7 +1601,7 @@ msgstr "有 %lu 个软件包没有被完全安装或�载。\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1534,35 +1609,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1575,38 +1643,6 @@ msgstr[0] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "�警告】：下列软件包�能通过验��"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "忽略了认�警告。\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "有些软件包�能通过验�"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "��验�就安装这些软件包�？"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "无法下载 %s  %s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1617,74 +1653,43 @@ msgstr "无法将 %s �命�为 %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr " update 命令�需��数"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "完�"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "命中 "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "获�："
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "忽略 "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "错误 "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [执行中]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"更�介质：请把标有\n"
-"“%s�\n"
-"的盘片�入驱动器“%s��按回车键\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读� %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1756,36 +1761,426 @@ msgstr "这个�示之�的错误消��值得您注�。请更正它们，
 msgid "Merging available information"
 msgstr "正在�并�用信�"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "把 DropNode 用在了�在链表中的节点上"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "无法定�哈希表元素�"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "无法读� %s 的状�"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "无法分�转移项"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "无法写入 %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "内部错误，出现在 AddDiversion"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "无法获得 debconf 的版本。您安装了 debconf �？"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "软件包的扩展列表太长"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "�试覆盖一个转移项，%s -> %s 和 %s/%s"
+msgid "Error processing directory %s"
+msgstr "处�目录 %s 时出错"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "�扩展列表太长"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "将头写入到目录文件时出错"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项 %s-> %s"
+msgid "Error processing contents %s"
+msgstr "处�目录 %s 时出错"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "没有任何选定项是匹�的"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "��的�置文件 %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "软件包文件组“%s�中缺少一些文件"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "数�库被��，该数�库文件的文件�已改� %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "数�库已过期，现�试进行�级 %s"
+
+#: ftparchive/cachedb.cc:94
+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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "无法打开数�库文件 %s：%s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "无法获得 %s 的状�"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "无法读�符�链接 %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "归档文件没有包�控制字段"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "归档文件没有包� package 字段"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s 中没有 override 项\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s 的维护者 %s 并� %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s 没有�代�的 override 项\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s 中没有二进制文件的 override 项\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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 时出错"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "无法将 %s �命�为 %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1811,17 +2206,6 @@ msgstr "该软件包正�试写入转移对象 %s/%s"
 msgid "The diversion path is too long"
 msgstr "该转移路径太长"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1850,30 +2234,36 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的��文件"
 msgid "Unable to stat %s"
 msgstr "无法读� %s 的状�"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "把 DropNode 用在了�在链表中的节点上"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "无法关闭文件 %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "无法定�哈希表元素�"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "无法分�转移项"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "内部错误，出现在 AddDiversion"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "这�是一个有效的 DEB 包文件，其包内��了“%s�"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "�试覆盖一个转移项，%s -> %s 和 %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "内部错误，无法定�包内文件 %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "添加了两个转移项 %s-> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "�能解�的主控文件"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "��的�置文件 %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1921,198 +2311,52 @@ msgstr "Tar 的校验和�符，文件已��"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 数�头类型 %u，�员 %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "正在�行 dpkg"
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "�支�“%s�打包系统"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "无法确定适�的打包系统类型"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "已写入 %i �记录。\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "已写入 %i �记录，并有 %i 个文件缺失。\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "已写入 %i �记录，并有 %i 个文件�匹�\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "这�是一个有效的 DEB 包文件，其包内��了“%s�"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "已写入 %i �记录，并有 %i 个缺失，以� %i 个文件�匹�\n"
+msgid "Internal error, could not locate member %s"
+msgstr "内部错误，无法定�包内文件 %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "无法找到认�记录：%s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "�能解�的主控文件"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash 校验和�符：%s"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "无法解�或打开软件包的列表或是状�文件。"
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "您�能需��行 apt-get update �解决这些问题"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "无法读��列表。"
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "软件包缓存区是空的"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "软件包缓存文件��了"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "软件包缓存区文件的版本�兼容"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "软件包缓存文件��了"
+msgid "List directory %spartial is missing."
+msgstr "软件包列表的目录 %spartial 缺失。"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "本程�目��支�“%s�版本系统"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "软件包缓存区是为其它架构的硬件构建的"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "�赖"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "预�赖"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "建议"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "推�"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "冲�"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "替�"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "废弃"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "破�"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "增强"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "��"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "必需"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "标准"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "�选"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "�外"
+msgid "Archives directory %spartial is missing."
+msgstr "仓库目录 %spartial 确实。"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "无法找到获�软件包的渠� %s 所需的驱动程�。"
+msgid "Unable to lock directory %s"
+msgstr "无法对目录 %s 加�"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "请检查是�安装了“dpkg-dev�软件包。\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "获�软件包的渠� %s 所需的驱动程�没有正常�动。"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有“%s�的盘片�入驱动器“%s��按回车键。"
-
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Clean of %s is not supported"
 msgstr "�支�索引文件类型“%s�"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "无法打开状�文件 %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状�文件 %s"
+msgid "Retrieving file %li of %li"
+msgstr "正在下载第 %li 个文件，共 %li 个"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2132,35 +2376,35 @@ msgstr "大��符"
 msgid "Invalid file format"
 msgstr "无效的�作 %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "无法解�软件包仓库 Release 文件 %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 ID 的密钥没有�用的公钥：\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲�的�行版：%s (期望 %s 但得到 %s)"
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2169,12 +2413,12 @@ msgstr ""
 "校验签�出错。此仓库未被更新，�然使用以�的索引文件。GPG 错误：%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 错误：%s: %s"
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2183,174 +2427,120 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这�情况下�能需�您手动修正这个软件"
 "包。(缘于架构缺失)"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已��。找�到对应软件包 %s 的 Filename: 字段。"
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "软件包暂存区使用的是�兼容的版本控制系统"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "无法找到获�软件包的渠� %s 所需的驱动程�。"
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "处� %s (FindPkg)时出错"
-
-#: 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:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇，软件包版本数�超出了本 APT 的处�能力。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇，软件包说明数�超出了本 APT 的处�能力。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇，�赖关系数�超出了本 APT 的处�能力。"
+msgid "Is the package %s installed?"
+msgstr "请检查是�安装了“dpkg-dev�软件包。\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "当处�文件�赖关系时，无法找到软件包 %s %s"
+msgid "Method %s did not start correctly"
+msgstr "获�软件包的渠� %s 所需的驱动程�没有正常�动。"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "无法获��软件包列表 %s 的状�"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "请把标有“%s�的盘片�入驱动器“%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/algorithms.cc:265
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "软件包 %s 需��新安装，但是我无法找到相应的安装文件。"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集文件所�供的软件包"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"错误，pkgProblemResolver::Resolve �生故障，这�能是有软件包被�求��现状的"
+"缘故。"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "无法写入 %s"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"无法修正错误，因为您�求�些软件包��现状，就是它们破�了软件包间的�赖关"
+"系。"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "无法读�或写入软件�缓存"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "无法解�或打开软件包的列表或是状�文件。"
 
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "软件�供者数��内 %s 没有包�指纹信�"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "您�能需��行 apt-get update �解决这些问题"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "软件包列表的目录 %spartial 缺失。"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "无法读��列表。"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "仓库目录 %spartial 确实。"
+msgid "Release '%s' for '%s' was not found"
+msgstr "未找到“%2$s�的“%1$s��布版本"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "无法对目录 %s 加�"
+msgid "Version '%s' for '%s' was not found"
+msgstr "未找到“%2$s�的“%1$s�版本"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
+msgid "Couldn't find task '%s'"
+msgstr "无法找到任务 %s"
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/cacheset.cc:609
 #, 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 ""
-"有一些索引文件�能下载，它们�能被忽略了，也�能转而使用了旧的索引文件。"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "无法按照正则表达� %s 找到任何软件包"
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 写入一些“软件��的 URI"
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "无法按照正则表达� %s 找到任何软件包"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "无法读� %s 的状�。"
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "无法从完全虚拟的软件包 %s 中选择版本"
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, 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 字段头"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, 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 "没有为版本�定指定优先级(或为零)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, 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:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "无法打开文件 %s"
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "因为软件包 %s 没有候选版本，无法进行选择"
 
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 选项。"
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2434,55 +2624,86 @@ msgstr "正在写入新的�列表\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "对应于该盘片的软件�设置项是：\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "软件包 %s 需��新安装，但是我无法找到相应的安装文件。"
+msgid "Unable to stat %s."
+msgstr "无法读� %s 的状�。"
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"错误，pkgProblemResolver::Resolve �生故障，这�能是有软件包被�求��现状的"
-"缘故。"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在分�软件包的�赖关系树"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"无法修正错误，因为您�求�些软件包��现状，就是它们破�了软件包间的�赖关"
-"系。"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候选版本"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "生��赖关系"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "无法打开状�文件 %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入临时状�文件 %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "无法解�软件包文件 %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "已写入 %i �记录。\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "无法解�软件包文件 %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "已写入 %i �记录，并有 %i 个文件缺失。\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "已写入 %i �记录，并有 %i 个文件�匹�\n"
+
+#: 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 "已写入 %i �记录，并有 %i 个缺失，以� %i 个文件�匹�\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "无法找到认�记录：%s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash 校验和�符：%s"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2509,6 +2730,215 @@ msgstr "软件包仓库 Release 文件 %s 内 Valid-Until �目无效"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内 Date �目无效"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "�支�“%s�打包系统"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "无法确定适�的打包系统类型"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "正在�行 dpkg"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "无法打开文件 %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "软件包缓存区是空的"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "软件包缓存文件��了"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "软件包缓存区文件的版本�兼容"
+
+#: apt-pkg/pkgcache.cc:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "软件包缓存文件��了"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "本程�目��支�“%s�版本系统"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "软件包缓存区是为其它架构的硬件构建的"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "�赖"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "预�赖"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "建议"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "推�"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "冲�"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "替�"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "废弃"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "破�"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr "增强"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "��"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "必需"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "标准"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "�选"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "�外"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇，软件包数�超出了本 APT 的处�能力。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇，软件包版本数�超出了本 APT 的处�能力。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇，软件包说明数�超出了本 APT 的处�能力。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇，�赖关系数�超出了本 APT 的处�能力。"
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "无法获��软件包列表 %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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "无法读�或写入软件�缓存"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "�支�索引文件类型“%s�"
+
+#: 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2584,222 +3014,142 @@ msgstr "无法识别在�列表 %3$s 里，第 %2$u 行中的软件包类别“
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "无法识别在�列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s�"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "未找到“%2$s�的“%1$s��布版本"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "未找到“%2$s�的“%1$s�版本"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "无法找到任务 %s"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "您必须在您的 sources.list 写入一些“软件��的 URI"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "无法按照正则表达� %s 找到任何软件包"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "无法按照正则表达� %s 找到任何软件包"
+msgid "Unable to parse package file %s (1)"
+msgstr "无法解�软件包文件 %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "无法从完全虚拟的软件包 %s 中选择版本"
+msgid "Unable to parse package file %s (2)"
+msgstr "无法解�软件包文件 %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"有一些索引文件�能下载，它们�能被忽略了，也�能转而使用了旧的索引文件。"
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "软件�供者数��内 %s 没有包�指纹信�"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "因为软件包 %s 没有候选版本，无法进行选择"
+msgid "Unable to stat the mount point %s"
+msgstr "无法读�文件系统挂载点 %s 的状�"
 
-#: 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/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "无法读�盘片的状�"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "正在安装 %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "未知的命令行选项“%c� [�自 %s]"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "正在�置 %s"
+msgid "Command line option %s is not understood"
+msgstr "无法识别命令行选项 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "正在删除 %s"
+msgid "Command line option %s is not boolean"
+msgstr "命令行选项 %s �是布尔值"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Completely removing %s"
-msgstr "完全删除 %s"
+msgid "Option %s requires an argument."
+msgstr "选项 %s �求有一个�数"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr "注�到 %s 已�消失"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "选项 %s：�置项�必须包�有形如“=<��>�的具体指定"
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "执行安装�执行的触�器 %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "选项 %s �求有一个整数作为�数，而�是“%s�"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "目录 %s 缺失"
+msgid "Option '%s' is too long"
+msgstr "选项“%s�太长"
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Could not open file '%s'"
-msgstr "无法打开文件 %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "�能识别�数 %s，请用 true 或 false"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing %s"
-msgstr "正在准备 %s"
+msgid "Invalid operation %s"
+msgstr "无效的�作 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Unpacking %s"
-msgstr "正在解压缩 %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "无法识别的类型缩写：“%c�"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "正在准备�置 %s"
+msgid "Opening configuration file %s"
+msgstr "正在打开�置文件 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Installed %s"
-msgstr "已安装 %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "语法错误 %s:%u：�置�节没有以�字开头"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "正在准备 %s 的删除�作"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "语法错误 %s:%u：标签格�有误"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Removed %s"
-msgstr "已删除 %s"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "语法错误 %s:%u：�置值�有多余的无�义数�"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "正在准备完全删除 %s"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "语法错误 %s:%u：�能在顶层�置文件中使用指示"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Completely removed %s"
-msgstr "完全删除了 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-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:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr "�赖问题 - ��未�置"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-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:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr "因为错误消�指示这是由于�盘已满，没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr "因为错误消�指示这是由于内存�足，没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr "因为错误消�指示这是由于�盘已满，没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr "因为错误消�指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "无法�定管�目录(%s)，是�有其他进程正�用它？"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "语法错误 %s:%u：Included from here"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "无法对状�列表目录加�(%s)，请查看您是�正以 root 用户�行？"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "语法错误 %s:%u：�支�的指令“%s�"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断，您必须手工�行 %s 解决此问题。"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "语法错误 %s:%u：clean 指令需�一个选项树作为�数"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "未�定"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "语法错误 %s:%u：文件尾部有多余的无�义的数�"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2914,54 +3264,11 @@ msgstr "用 unlink 删除文件 %s 出错"
 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... 完�"
-
-#. 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Selection %s not found"
-msgstr "找�到您选则的 %s"
+msgid "No keyring installed in %s."
+msgstr "%s 中没有安装密钥环。"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3015,516 +3322,220 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "No keyring installed in %s."
-msgstr "%s 中没有安装密钥环。"
+msgid "%c%s... Error!"
+msgstr "%c%s... 有错误�"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "未知的命令行选项“%c� [�自 %s]"
+msgid "%c%s... Done"
+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/progress.cc:181
+msgid "..."
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:168
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "命令行选项 %s �是布尔值"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... 完�"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "选项 %s �求有一个�数"
+msgid "%lid %lih %limin %lis"
+msgstr "%li天 %li�时 %li分 %li秒"
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "选项 %s：�置项�必须包�有形如“=<��>�的具体指定"
+msgid "%lih %limin %lis"
+msgstr "%li�时 %li分 %li秒"
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "选项 %s �求有一个整数作为�数，而�是“%s�"
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "选项“%s�太长"
+msgid "%lis"
+msgstr "%li秒"
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "�能识别�数 %s，请用 true 或 false"
+msgid "Selection %s not found"
+msgstr "找�到您选则的 %s"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "软件包的扩展列表太长"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "无法�定管�目录(%s)，是�有其他进程正�用它？"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Error processing directory %s"
-msgstr "处�目录 %s 时出错"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "�扩展列表太长"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "将头写入到目录文件时出错"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "无法对状�列表目录加�(%s)，请查看您是�正以 root 用户�行？"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "处�目录 %s 时出错"
-
-#: ftparchive/apt-ftparchive.cc:626
 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:841
-msgid "No selections matched"
-msgstr "没有任何选定项是匹�的"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "软件包文件组“%s�中缺少一些文件"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "数�库被��，该数�库文件的文件�已改� %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "数�库已过期，现�试进行�级 %s"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg 被中断，您必须手工�行 %s 解决此问题。"
 
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"数�库格�无效。如果您是从一个�版本的 apt �级而�，请删除数�库并�建它。"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "未�定"
 
-#: ftparchive/cachedb.cc:99
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "无法打开数�库文件 %s：%s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "无法读�符�链接 %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "归档文件没有包�控制字段"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "无法获得游标"
+msgid "Installing %s"
+msgstr "正在安装 %s"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "警告：无法读�目录 %s\n"
+msgid "Configuring %s"
+msgstr "正在�置 %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, 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 "错误：处�文件时出错 "
+msgid "Removing %s"
+msgstr "正在删除 %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "无法解� %s"
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "无法�历目录树"
+msgid "Completely removing %s"
+msgstr "完全删除 %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "无法打开 %s"
+msgid "Noting disappearance of %s"
+msgstr "注�到 %s 已�消失"
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "执行安装�执行的触�器 %s"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "无法读�符�链接 %s"
+msgid "Directory '%s' missing"
+msgstr "目录 %s 缺失"
 
-#: ftparchive/writer.cc:290
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "无法使用 unlink 删除 %s"
+msgid "Could not open file '%s'"
+msgstr "无法打开文件 %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** 无法将 %s 链接到 %s"
+msgid "Preparing %s"
+msgstr "正在准备 %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " 达到了 DeLink 的上� %sB。\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "归档文件没有包� package 字段"
+msgid "Unpacking %s"
+msgstr "正在解压缩 %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s 中没有 override 项\n"
+msgid "Preparing to configure %s"
+msgstr "正在准备�置 %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 的维护者 %s 并� %s\n"
+msgid "Installed %s"
+msgstr "已安装 %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s 没有�代�的 override 项\n"
+msgid "Preparing for removal of %s"
+msgstr "正在准备 %s 的删除�作"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s 中没有二进制文件的 override 项\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 分�内存失败"
+msgid "Removed %s"
+msgstr "已删除 %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "正在准备完全删除 %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "完全删除了 %s"
 
-#: ftparchive/override.cc:191
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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�"
+msgid "Can not write log (%s)"
+msgstr "无法写入 %s"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "压缩�的输出文件 %s �求有一个压缩文件集�"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "无法创建 FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "无法 fork"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "压缩�进程"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr "由于已�达到 MaxReports �制，没有写入 apport 报告。"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "内部错误，无法创建 %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr "�赖问题 - ��未�置"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "无法对�进程或文件进行读写"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr "因为错误消�指示这是由于上一个问题导致的错误，没有写入 apport 报告。"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "在计算 MD5 校验和时无法读�数�"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr "因为错误消�指示这是由于�盘已满，没有写入 apport 报告。"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "在使用 unlink 删除 %s 时出错"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr "因为错误消�指示这是由于内存�足，没有写入 apport 报告。"
 
-#: cmdline/apt-internal-solver.cc:47
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
 #, 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 "未知的软件包记录�"
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr "因为错误消�指示这是由于�盘已满，没有写入 apport 报告。"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr "因为错误消�指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "内部错误，全部�级工具�事了"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s �是一个有效的 DEB 软件包。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7fd5c6176..59a8dcac7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,12 +8,12 @@ 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-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
 "debian.org>\n"
-"Language: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,75 +98,75 @@ msgstr "統計後的空間�計："
 msgid "Package file %s is out of sync."
 msgstr "套件檔 %s 未�步。"
 
-#: 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-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "您必須明確得給定一個樣�"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "找�到套件 %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "套件檔："
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 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:1566
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "鎖定的套件："
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(未找到)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  已安�："
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  候�："
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(ç„¡)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "  套件鎖定："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: 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:1749
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -328,7 +328,7 @@ msgid "Couldn't find package %s"
 msgstr "無法找到套件 %s"
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被設定為手動安�。\n"
@@ -356,7 +356,7 @@ msgstr "無法鎖定下載目錄"
 msgid "Must specify at least one package to fetch source for"
 msgstr "在�得原始碼時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 的原始碼套件"
@@ -382,7 +382,7 @@ msgid "Skipping already downloaded file '%s'\n"
 msgstr "略�已下載的檔案 '%s'\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "無法確� %s 的未使用空間"
@@ -415,7 +415,7 @@ msgstr "�得原始碼 %s\n"
 msgid "Failed to fetch some archives."
 msgstr "無法�得�些套件檔。"
 
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "下載完�，且這是『僅下載�模�"
 
@@ -424,66 +424,66 @@ msgstr "下載完�，且這是『僅下載�模�"
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "�解開，因原始碼已解開至 %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "解開指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:964
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "請檢查是�已安�了 'dpkg-dev' 套件。\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:992
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "編譯指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1011
 msgid "Child process failed"
 msgstr "�程�失敗"
 
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:1030
 msgid "Must specify at least one package to check builddeps for"
 msgstr "在檢查編譯相�關係時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法�得 %s 的編譯相�關係資訊"
 
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1102
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 沒有編譯相�關係。\n"
 
-#: cmdline/apt-get.cc:1271
+#: cmdline/apt-get.cc:1272
 #, 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:1289
+#: cmdline/apt-get.cc:1290
 #, 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:1312
+#: cmdline/apt-get.cc:1313
 #, 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:1351
+#: cmdline/apt-get.cc:1352
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -491,37 +491,37 @@ msgid ""
 msgstr ""
 "無法滿足 %2$s 所�求的 %1$s 相�關係，因為套件 %3$s 沒有版本符�其版本需求"
 
-#: cmdline/apt-get.cc:1357
+#: cmdline/apt-get.cc:1358
 #, 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:1380
+#: cmdline/apt-get.cc:1381
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 的相�關係 %1$s：%3$s"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1396
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 的編譯相�關係。"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1401
 msgid "Failed to process build dependencies"
 msgstr "無法處�編譯相�關係"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "正和 %s (%s) 連線"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1592
 msgid "Supported modules:"
 msgstr "已支�模組："
 
-#: cmdline/apt-get.cc:1635
+#: cmdline/apt-get.cc:1633
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -607,16 +607,20 @@ msgstr ""
 "以�得更多資訊和�項。\n"
 "                        該 APT 有著超級牛力。\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "在�得原始碼時必須至少指定一個套件"
 
-#: cmdline/apt-helper.cc:53
+#: cmdline/apt-helper.cc:67
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:66
+#: cmdline/apt-helper.cc:80
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -625,6 +629,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
@@ -654,8 +659,9 @@ msgstr "%s 已經是最新版本了。\n"
 msgid "%s was already not hold.\n"
 msgstr "%s 已經是最新版本了。\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1272
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待 %s 但是它並�存在"
@@ -847,7 +853,7 @@ msgstr "無法建立 Socket"
 msgid "Could not connect data socket, connection timed out"
 msgstr "無法和 data socket 連線，連線逾時"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "失敗"
 
@@ -893,7 +899,7 @@ msgstr "Data socket 連線逾時"
 msgid "Unable to accept connection"
 msgstr "無法接�連線"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "有�題的雜湊檔"
 
@@ -1022,142 +1028,228 @@ msgstr "由於無法�得它們的公鑰，以下簽章無法進行驗證：\n"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:509
+#: methods/http.cc:511
 msgid "Error writing to the file"
 msgstr "在寫入該檔時發生錯誤"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 msgid "Error reading from server. Remote end closed connection"
 msgstr "在讀�伺�器時發生錯誤，�端主機已關閉連線"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server"
 msgstr "在讀�伺�器時發生錯誤"
 
-#: methods/http.cc:561
+#: methods/http.cc:563
 msgid "Error writing to file"
 msgstr "在寫入檔案時發生錯誤"
 
-#: methods/http.cc:621
+#: methods/http.cc:623
 msgid "Select failed"
 msgstr "�擇失敗"
 
-#: methods/http.cc:626
+#: methods/http.cc:628
 msgid "Connection timed out"
 msgstr "連線逾時"
 
-#: methods/http.cc:649
+#: methods/http.cc:651
 msgid "Error writing to output file"
 msgstr "在寫入輸出檔時發生錯誤"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "等待標頭"
 
-#: methods/server.cc:109
+#: methods/server.cc:110
 msgid "Bad header line"
 msgstr "標頭行錯誤"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:135 methods/server.cc:142
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 伺�器傳�了一個無效的回覆標頭"
 
-#: methods/server.cc:171
+#: methods/server.cc:172
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 伺�器傳�了一個無效的 Content-Length 標頭"
 
-#: methods/server.cc:194
+#: methods/server.cc:195
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 伺�器傳�了一個無效的 Content-Range 標頭"
 
-#: methods/server.cc:196
+#: methods/server.cc:197
 msgid "This HTTP server has broken range support"
 msgstr "這個 HTTP 伺�器的範�支�有�題"
 
-#: methods/server.cc:220
+#: methods/server.cc:221
 msgid "Unknown date format"
 msgstr "未知的資料格�"
 
-#: methods/server.cc:489
+#: methods/server.cc:490
 msgid "Bad header data"
 msgstr "錯誤的標頭資料"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/server.cc:654
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "已有 "
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr "下載:"
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr "略� "
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr "錯誤 "
+
+#: 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:236
+#, c-format
+msgid " [Working]"
+msgstr " [工作中]"
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"更�媒體：請把以下�稱的光碟\n"
+" '%s'\n"
+"放入 '%s' �置，然後按 [Enter] �\n"
+
+#: 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-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "�警告】：無法驗證下列套件�"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "忽略了驗證警告。\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "有部份套件無法驗證"
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr "是��經驗證就安�這些套件？"
+
+#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
+msgid "There are problems and -y was used without --force-yes"
+msgstr "發生了�題，且 -y 並沒有和 --force-yes ��使用"
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "無法�得 %s，%s\n"
+
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "內部錯誤，在�毀的套件上執行 InstallPackages�"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有套件需�被移除，但�被�止移除。"
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "內部錯誤，排�未能完�"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 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:154
+#: apt-private/private-install.cc:155
 #, 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:159
+#: apt-private/private-install.cc:160
 #, 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:166
+#: apt-private/private-install.cc:167
 #, 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:171
+#: apt-private/private-install.cc:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "此�作完�之後，會空出 %sB 的�碟空間。\n"
 
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "在 %s 裡沒有足夠的的未使用空間。"
 
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "發生了�題，且 -y 並沒有和 --force-yes ��使用"
-
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 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:219
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1168,20 +1260,20 @@ msgstr ""
 "請輸入 '%s' 這個��以繼續進行\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "放棄執行。"
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "是�繼續進行 [Y/n]？"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "有部份檔案無法下載"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1189,19 +1281,19 @@ msgstr ""
 "有部份套件檔無法�得，試著執行 apt-get update 或者試著加上 --fix-missing �"
 "項？"
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目�尚未支� --fix-missing 和媒體抽�"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "無法修正欠缺的套件。"
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "放棄安�。"
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1211,15 +1303,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我們沒有計劃�刪除任何�西，無法啟動 AutoRemover"
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1237,15 +1329,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "以下的資訊或許有助於解決當�的情�："
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "內部錯誤，AutoRemover 處�失敗"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1255,7 +1347,7 @@ msgid_plural ""
 msgstr[0] "以下套件是被自動安�進來的，且已��會被用到了："
 msgstr[1] "以下套件是被自動安�進來的，且已��會被用到了："
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1263,7 +1355,7 @@ msgid_plural ""
 msgstr[0] "以下套件是被自動安�進來的，且已��會被用到了："
 msgstr[1] "以下套件是被自動安�進來的，且已��會被用到了："
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1282,7 +1374,7 @@ msgstr ""
 "未能滿足相�關係。請試著�指定套件來執行 'apt-get -f install'（或採�其它的解"
 "決方案）。"
 
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
 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"
@@ -1292,68 +1384,68 @@ msgstr ""
 "有些套件無法安�。這�能�謂著您的�求難以解決，或是若您使用的是\n"
 "unstable 發行版，�能有些必�的套件尚未建立，或是被移出 Incoming 了。"
 
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "�毀的套件"
 
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "下列的�外套件將被安�："
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "建議套件："
 
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "推薦套件："
 
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略 %s，它已被安�且沒有計劃�進行�級。\n"
 
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "忽略 %s，它已被安�且沒有計劃�進行�級。\n"
 
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "無法�新安� %s，因為它無法下載。\n"
 
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 已經是最新版本了。\n"
 
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "�定的版本為 %3$s 的 %1$s (%2$s)\n"
 
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "�定的版本為 %3$s 的 %1$s (%2$s)\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "套件 %s 並沒有被安�，所以也�會被移除\n"
 
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "套件 %s 並沒有被安�，所以也�會被移除\n"
 
-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1361,136 +1453,116 @@ msgid_plural ""
 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-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-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:265
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr "�已安�】"
 
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:268
 #, fuzzy
 msgid "[installed,local]"
 msgstr "�已安�】"
 
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:270
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:272
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr "�已安�】"
 
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:274
 #, fuzzy
 msgid "[installed]"
 msgstr "�已安�】"
 
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:277
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:281
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "下列的套件有未滿足的相�關係："
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:455
 #, c-format
 msgid "but %s is installed"
 msgstr "但 %s �已安�"
 
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:457
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但 %s �將被安�"
 
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:464
 msgid "but it is not installable"
 msgstr "但它�無法安�"
 
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:466
 msgid "but it is a virtual package"
 msgstr "但它是虛擬套件"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not installed"
 msgstr "但它�尚未安�"
 
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
 msgstr "但它�將�會被安�"
 
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:474
 msgid " or"
 msgstr "或"
 
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "下列的套件有未滿足的相�關係："
+
+#: apt-private/private-output.cc:523
 msgid "The following NEW packages will be installed:"
 msgstr "下列�新】套件將會被安�："
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:549
 msgid "The following packages will be REMOVED:"
 msgstr "下列套件將會被�移除】："
 
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:571
 msgid "The following packages have been kept back:"
 msgstr "下列套件將會維�其原有版本："
 
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:592
 msgid "The following packages will be upgraded:"
 msgstr "下列套件將會被�級："
 
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:613
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列套件將會被��級】："
 
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
 msgstr "下列被�留 (hold) 的套件將會被更改："
 
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s（因為 %s）"
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:696
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1498,27 +1570,27 @@ msgstr ""
 "�警告】：下列的基本套件都將被移除。\n"
 "除�您很清楚您在�什麼，�則請勿輕易嘗試�"
 
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "�級 %lu 個，新安� %lu 個，"
 
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:731
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "�新安� %lu 個，"
 
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:733
 #, c-format
 msgid "%lu downgraded, "
 msgstr "�級 %lu 個，"
 
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:735
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "移除 %lu 個，有 %lu 個未被�級。\n"
 
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:739
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu 個沒有完整得安�或移除。\n"
@@ -1527,7 +1599,7 @@ msgstr "%lu 個沒有完整得安�或移除。\n"
 #. 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:728
+#: apt-private/private-output.cc:761
 msgid "[Y/n]"
 msgstr ""
 
@@ -1535,36 +1607,28 @@ 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:734
+#: apt-private/private-output.cc:767
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:778
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:784
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 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-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/private-show.cc:156
 #, c-format
@@ -1578,35 +1642,6 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "�警告】：無法驗證下列套件�"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "忽略了驗證警告。\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "有部份套件無法驗證"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "是��經驗證就安�這些套件？"
-
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "無法�得 %s，%s\n"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1617,74 +1652,44 @@ msgstr "無法將 %s 更�為 %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update 指令�需任何�數"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
 msgstr ""
 
 #: 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
+#: apt-private/private-upgrade.cc:28
 msgid "Done"
 msgstr "完�"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "已有 "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "下載:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "略� "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "錯誤 "
-
-#: 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:236
-#, c-format
-msgid " [Working]"
-msgstr " [工作中]"
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"更�媒體：請把以下�稱的光碟\n"
-" '%s'\n"
-"放入 '%s' �置，然後按 [Enter] �\n"
-
 #. 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:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
 #: 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
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "Unable to read %s"
 msgstr "無法讀� %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1758,36 +1763,424 @@ msgstr "以上的訊�相當��。請修正它們並�新執行安�[I]"
 msgid "Merging available information"
 msgstr "整��有的資料"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode 在還有連��點時被呼�"
+#: 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"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "找�到雜湊元件�"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "無法�得 %s 的狀態"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "在�置抽�資訊時失敗"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#, c-format
+msgid "Unable to write to %s"
+msgstr "無法寫入 %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "在 AddDiversion 發生了內部錯誤"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "無法�得 debconf 版本。是�有安� debconf？"
 
-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "套件延伸列表�長"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "試圖改寫抽�資訊，%s -> %s 和 %s/%s"
+msgid "Error processing directory %s"
+msgstr "處�目錄 %s 時發生錯誤"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "原始碼的延伸列表太長"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "寫入標頭資訊到內容檔時發生錯誤"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "�複加入抽�資訊 %s -> %s"
+msgid "Error processing contents %s"
+msgstr "處�內容 %s 時發生錯誤"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:626
+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:822
+msgid "No selections matched"
+msgstr "找�到符�的�項"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "�複的設定檔 %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "套件檔案組 `%s' 少了部份檔案"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB 已�毀，檔案被更�為 %s.old"
+
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB �舊，嘗試�級 %s"
+
+#: ftparchive/cachedb.cc:94
+#, 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:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "無法開啟 DB 檔 %s: %s"
+
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "無法�得 %s 的狀態"
+
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "無法讀�連� %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "套件檔沒有 control 記錄"
+
+#: ftparchive/cachedb.cc:594
+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:417
+msgid "Archive had no package field"
+msgstr "套件檔裡沒有套件資訊"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s 沒有�新定義項目\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s 的維護者是 %s，而� %s\n"
+
+#: ftparchive/writer.cc:706
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s 沒有原始碼�新定義項目\n"
+
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s 也沒有二元碼�新定義項目\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+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 的連�時發生�題"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "無法將 %s 更�為 %s"
+
+#: cmdline/apt-internal-solver.cc:49
+#, 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/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/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
@@ -1813,17 +2206,6 @@ msgstr "此套件試圖寫至抽�後的目標 %s/%s"
 msgid "The diversion path is too long"
 msgstr "�進行抽�的路徑�長"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, 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"
@@ -1852,30 +2234,36 @@ msgstr "檔案 %s/%s 覆寫了套件 %s 中的相�檔案"
 msgid "Unable to stat %s"
 msgstr "無法�得 %s 的狀態"
 
-#: 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/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode 在還有連��點時被呼�"
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "關閉檔案 %s 失敗"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "找�到雜湊元件�"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "在�置抽�資訊時失敗"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "在 AddDiversion 發生了內部錯誤"
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "這是個�正確的 DEB 套件檔，沒有 '%s' �員"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "試圖改寫抽�資訊，%s -> %s 和 %s/%s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "內部錯誤，找�找到�員 %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "�複加入抽�資訊 %s -> %s"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "無法分�的 control 檔"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "�複的設定檔 %s/%s"
 
 #: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
@@ -1923,198 +2311,52 @@ msgstr "Tar checksum 失敗，套件檔已�毀"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 標頭類型 %u，�員 %s"
 
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "�支�的套件包�系統 '%s'"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "無法確���的套件包�系統類型"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "寫入 %i 筆紀錄。\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案�失了。\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案�符\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "這是個�正確的 DEB 套件檔，沒有 '%s' �員"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案�失了，有 %i 個檔案�符\n"
+msgid "Internal error, could not locate member %s"
+msgstr "內部錯誤，找�找到�員 %s"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "無法分�的 control 檔"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash Sum �符"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "無法分�或開啟套件清單或狀�檔。"
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "您也許得執行 apt-get update 以修正這些�題"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "無法讀�來�列表。"
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "清空套件快�"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "套件快�檔�壞"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "套件快�檔版本�符"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "套件快�檔�壞"
-
-#: apt-pkg/pkgcache.cc:174
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "本 APT �支� '%s' 版本系統"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "這個套件快�是用於�一種平�的"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "相�關係"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "�先相�關係"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "建議"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "推薦"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "��"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "�代"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "廢棄"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "毀�"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "��"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "必�"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "標準"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "次�"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "�外"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "找�到安�方�的驅動程� %s。"
+msgid "List directory %spartial is missing."
+msgstr "找�到清單目錄 %spartial。"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "請檢查是�已安�了 'dpkg-dev' 套件。\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "安�方� %s 沒有正確啟動"
+msgid "Archives directory %spartial is missing."
+msgstr "找�到套件檔目錄 %spartial。"
 
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "請把標籤為 '%s' 的光碟放入 '%s' �置中，然後按下 [Enter] �。"
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "無法鎖定列表目錄"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "�被支�的索引檔類型 '%s'"
 
-#: 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
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:902
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "無法開啟 StateFile %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在�得檔案 %li/%li（還有 %s）"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire.cc:904
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "無法寫入暫存的 StateFile %s"
+msgid "Retrieving file %li of %li"
+msgstr "正在�得檔案 %li/%li"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2134,35 +2376,35 @@ msgstr "大��符"
 msgid "Invalid file format"
 msgstr "無效的�作 %s"
 
-#: apt-pkg/acquire-item.cc:1581
+#: apt-pkg/acquire-item.cc:1573
 #, 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:1597
+#: apt-pkg/acquire-item.cc:1589
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "無法辨別 Release 檔 %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1631
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "無法�得以下的密鑰 ID 的公鑰：\n"
 
-#: apt-pkg/acquire-item.cc:1677
+#: apt-pkg/acquire-item.cc:1669
 #, 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:1699
+#: apt-pkg/acquire-item.cc:1691
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "發行版本��：%s（應當是 %s 但�得到 %s）"
 
-#: apt-pkg/acquire-item.cc:1729
+#: apt-pkg/acquire-item.cc:1721
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2170,12 +2412,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1867
+#: apt-pkg/acquire-item.cc:1859
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2184,170 +2426,118 @@ msgstr ""
 "找�到 %s 套件的�個檔案。這�味著您�能�手動修復這個套件。（因為找�到平"
 "�）"
 
-#: apt-pkg/acquire-item.cc:1933
+#: apt-pkg/acquire-item.cc:1925
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:1983
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "這個套件的索引檔�壞了。沒有套件 %s 的 Filename: 欄�。"
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "快�使用的是�相容的版本系統"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "找�到安�方�的驅動程� %s。"
 
-#. 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
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "在處� %s 時發生錯誤 (FindPkg)"
+msgid "Is the package %s installed?"
+msgstr "請檢查是�已安�了 'dpkg-dev' 套件。\n"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇呀，您已經超�這個 APT 所能處�的套件�稱數�了。"
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "安�方� %s 沒有正確啟動"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇呀，您已經超�這個 APT 所能處�的版本數�了。"
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "請把標籤為 '%s' 的光碟放入 '%s' �置中，然後按下 [Enter] �。"
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇呀，您已經超�這個 APT 所能處�的說明數�了。"
+#: 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 "套件 %s 需��新安�，但找�到它的套件檔。"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇呀，您已經超�這個 APT 所能處�的相�關係數�了。"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"錯誤，pkgProblemResolver::Resolve 的建立中斷了，這�能肇因於�留 (hold) 套"
+"件。"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "在計算檔案相�性時找�到套件 %s %s"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "無法修正�題，您�留 (hold) 了�毀的套件。"
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "無法�得來�套件列表 %s 的狀態"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+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 "正在讀�套件清單"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "您也許得執行 apt-get update 以修正這些�題"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集檔案�供者"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "無法讀�來�列表。"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/cacheset.cc:489
 #, 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 錯誤"
+msgid "Release '%s' for '%s' was not found"
+msgstr "找�到 '%2$s' 的 '%1$s' 發行版"
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "�供者�塊 %s 沒有包�指紋碼"
+msgid "Version '%s' for '%s' was not found"
+msgstr "找�到 '%s' 版的 '%s'"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "找�到清單目錄 %spartial。"
+msgid "Couldn't find task '%s'"
+msgstr "無法找到主題 %s"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "找�到套件檔目錄 %spartial。"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "無法找到套件 %s"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/cacheset.cc:615
 #, 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 "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 "在 sources.list 中必須包�一些 'source' URI"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "無法找到套件 %s"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Unable to stat %s."
-msgstr "無法�得 %s 的狀態。"
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "個人設定檔中有些�正確資料，沒有以 Package 開頭"
-
-#: apt-pkg/policy.cc:444
+#: apt-pkg/cacheset.cc:647
 #, 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 "銷定並沒有優先順�之分（或零）"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "無法開啟檔案 %s"
-
-#: apt-pkg/packagemanager.cc:583
+#: apt-pkg/cacheset.cc:663
 #, 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 "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"此安�因��或�先相�關係，需暫時刪除 %s 這個基本套件。這通常�是好主�，但"
-"若您執�進行，請設定 APT::Force-LoopBreak �項。"
 
 #: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
@@ -2427,53 +2617,86 @@ msgstr "正在寫入新的來�列表\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "該碟片的來�列表項目為：\n"
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "套件 %s 需��新安�，但找�到它的套件檔。"
+msgid "Unable to stat %s."
+msgstr "無法�得 %s 的狀態。"
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"錯誤，pkgProblemResolver::Resolve 的建立中斷了，這�能肇因於�留 (hold) 套"
-"件。"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在�建相�關係"
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "無法修正�題，您�留 (hold) 了�毀的套件。"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候�版本"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: 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 "Failed to open StateFile %s"
+msgstr "無法開啟 StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "無法寫入暫存的 StateFile %s"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "無法辨識套件檔 %s (1)"
+msgid "Wrote %i records.\n"
+msgstr "寫入 %i 筆紀錄。\n"
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "無法辨識套件檔 %s (2)"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案�失了。\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案�符\n"
+
+#: 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 "寫入 %i 筆紀綠，其中有 %i 個檔案�失了，有 %i 個檔案�符\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum �符"
 
 #: apt-pkg/indexrecords.cc:78
 #, c-format
@@ -2500,6 +2723,212 @@ msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "�支�的套件包�系統 '%s'"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "無法確���的套件包�系統類型"
+
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#, 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:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "無法開啟檔案 %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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/pkgcache.cc:155
+msgid "Empty package cache"
+msgstr "清空套件快�"
+
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr "套件快�檔�壞"
+
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr "套件快�檔版本�符"
+
+#: apt-pkg/pkgcache.cc:169
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "套件快�檔�壞"
+
+#: apt-pkg/pkgcache.cc:174
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "本 APT �支� '%s' 版本系統"
+
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
+msgstr "這個套件快�是用於�一種平�的"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "相�關係"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "�先相�關係"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "建議"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "推薦"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "��"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "�代"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "廢棄"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "毀�"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "��"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "必�"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "標準"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "次�"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "�外"
+
+#: 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: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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇呀，您已經超�這個 APT 所能處�的套件�稱數�了。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇呀，您已經超�這個 APT 所能處�的版本數�了。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇呀，您已經超�這個 APT 所能處�的說明數�了。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇呀，您已經超�這個 APT 所能處�的相�關係數�了。"
+
+#: 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "無法�得來�套件列表 %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-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "在儲存來�快�時 IO 錯誤"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "�被支�的索引檔類型 '%s'"
+
+#: 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 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/sourcelist.cc:127
 #, fuzzy, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2575,221 +3004,141 @@ msgstr "未知的類型 '%1$s'，�於在來�列表 %3$s 中的第 %2$u 行"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "未知的類型 '%1$s'，�於在來�列表 %3$s 中的第 %2$u 行"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "找�到 '%2$s' 的 '%1$s' 發行版"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "在 sources.list 中必須包�一些 'source' URI"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "找�到 '%s' 版的 '%s'"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "無法找到主題 %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "無法找到套件 %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "無法找到套件 %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "無法辨識套件檔 %s (1)"
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unable to parse package file %s (2)"
+msgstr "無法辨識套件檔 %s (2)"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "有一些索引檔�能下載，它們�能被略�了，或是替而使用原有的索引檔。"
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Vendor block %s contains no fingerprint"
+msgstr "�供者�塊 %s 沒有包�指紋碼"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Unable to stat the mount point %s"
+msgstr "無法�得掛載點 %s 的狀態"
 
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "無法�得 CD-ROM 的狀態"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Installing %s"
-msgstr "正在安� %s"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "未知的命令列�項 '%c' [來自 %s]。"
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Configuring %s"
-msgstr "正在設定 %s"
+msgid "Command line option %s is not understood"
+msgstr "無法�解的命令列�項 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Removing %s"
-msgstr "正在移除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:98
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "已完整移除 %s"
+msgid "Command line option %s is not boolean"
+msgstr "命令列�項 %s �是 boolean 值"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Option %s requires an argument."
+msgstr "需替�項 %s 指定�數。"
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Running post-installation trigger %s"
-msgstr "正在執行安�後套件後續處�程� %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "�項 %s：在指定設定項目時應該有 =<val>。"
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "找�到 '%s' 目錄"
-
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "無法開啟檔案 %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "�項 %s 的�數應該是數字，而�是 '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Preparing %s"
-msgstr "正在準備 %s"
+msgid "Option '%s' is too long"
+msgstr "�項 %s 太長"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Unpacking %s"
-msgstr "正在解開 %s"
+msgid "Sense %s is not understood, try true or false."
+msgstr "�測器 %s 無法�解，試試 true 或 false。"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "正在準備設定 %s"
+msgid "Invalid operation %s"
+msgstr "無效的�作 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "Installed %s"
-msgstr "已安� %s"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "無法辨識的縮寫類型：'%c'"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "正在準備移除 %s"
+msgid "Opening configuration file %s"
+msgstr "開啟設定檔 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Removed %s"
-msgstr "已移除 %s"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "語法錯誤 %s:%u：�塊開頭沒有�稱。"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "正在準備完整移除 %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "語法錯誤 %s:%u：標籤格�錯誤"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Completely removed %s"
-msgstr "已完整移除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾"
 
-#: apt-pkg/deb/dpkgpm.cc:1651
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+#: 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/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "語法錯誤 %s:%u: 太多巢狀引入檔"
 
-#: apt-pkg/deb/dpkgpm.cc:1685
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: 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/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "語法錯誤 %s:%u：�支�的指令 '%s'"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:900
 #, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "無法鎖定列表目錄"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "語法錯誤 %s:%u：指令�能於最高層級執行"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "語法錯誤 %s:%u：在檔案�尾有多餘的垃圾"
 
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
@@ -2904,54 +3253,11 @@ msgstr "在刪除檔案時發生�題"
 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
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 完�"
-
-#. 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 找�到"
+msgid "No keyring installed in %s."
+msgstr "放棄安�。"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3007,514 +3313,219 @@ 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
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "語法錯誤 %s:%u：從此引入"
+msgid "%c%s... Error!"
+msgstr "%c%s... 錯誤�"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/progress.cc:150
 #, 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：指令�能於最高層級執行"
+msgid "%c%s... Done"
+msgstr "%c%s... 完�"
 
-#: apt-pkg/contrib/configuration.cc:950
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "語法錯誤 %s:%u：在檔案�尾有多餘的垃圾"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, 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 值"
+msgid "%c%s... %u%%"
+msgstr "%c%s... 完�"
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "需替�項 %s 指定�數。"
+msgid "%lid %lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "�項 %s：在指定設定項目時應該有 =<val>。"
+msgid "%lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "�項 %s 的�數應該是數字，而�是 '%s'"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "�項 %s 太長"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/strutl.cc:1258
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "�測器 %s 無法�解，試試 true 或 false。"
+msgid "Selection %s not found"
+msgstr "�項 %s 找�到"
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/deb/debsystem.cc:91
 #, 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"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 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
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "套件延伸列表�長"
-
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, c-format
-msgid "Error processing directory %s"
-msgstr "處�目錄 %s 時發生錯誤"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "原始碼的延伸列表太長"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "寫入標頭資訊到內容檔時發生錯誤"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "無法鎖定列表目錄"
 
-#: ftparchive/apt-ftparchive.cc:431
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Error processing contents %s"
-msgstr "處�內容 %s 時發生錯誤"
-
-#: ftparchive/apt-ftparchive.cc:626
 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"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 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:841
-msgid "No selections matched"
-msgstr "找�到符�的�項"
-
-#: ftparchive/apt-ftparchive.cc:919
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "套件檔案組 `%s' 少了部份檔案"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB 已�毀，檔案被更�為 %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB �舊，嘗試�級 %s"
 
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
-"資料庫格��正確。如果您是由舊版的 apt �級上來的，請移除並�新建立資料庫。"
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "無法開啟 DB 檔 %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "無法讀�連� %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "套件檔沒有 control 記錄"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "無法�得�標"
-
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "警告：無法讀�目錄 %s\n"
+msgid "Installing %s"
+msgstr "正在安� %s"
 
-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
 #, 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 "錯誤：套用到檔案時發生錯誤"
+msgid "Configuring %s"
+msgstr "正在設定 %s"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "無法解� %s"
+msgid "Removing %s"
+msgstr "正在移除 %s"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "無法走訪目錄樹"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "已完整移除 %s"
 
-#: ftparchive/writer.cc:219
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Failed to open %s"
-msgstr "無法開啟 %s"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Running post-installation trigger %s"
+msgstr "正在執行安�後套件後續處�程� %s"
 
-#: ftparchive/writer.cc:286
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:830
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "無法讀�連� %s"
+msgid "Directory '%s' missing"
+msgstr "找�到 '%s' 目錄"
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "無法移除連� %s"
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "無法開啟檔案 %s"
 
-#: ftparchive/writer.cc:298
+#: apt-pkg/deb/dpkgpm.cc:992
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** 無法將 %s 連�到 %s"
+msgid "Preparing %s"
+msgstr "正在準備 %s"
 
-#: ftparchive/writer.cc:308
+#: apt-pkg/deb/dpkgpm.cc:993
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " �到了 DeLink 的上� %sB。\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "套件檔裡沒有套件資訊"
+msgid "Unpacking %s"
+msgstr "正在解開 %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: apt-pkg/deb/dpkgpm.cc:998
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s 沒有�新定義項目\n"
+msgid "Preparing to configure %s"
+msgstr "正在準備設定 %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 的維護者是 %s，而� %s\n"
+msgid "Installed %s"
+msgstr "已安� %s"
 
-#: ftparchive/writer.cc:706
+#: apt-pkg/deb/dpkgpm.cc:1005
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s 沒有原始碼�新定義項目\n"
+msgid "Preparing for removal of %s"
+msgstr "正在準備移除 %s"
 
-#: ftparchive/writer.cc:710
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s 也沒有二元碼�新定義項目\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 無法�置記憶體"
+msgid "Removed %s"
+msgstr "已移除 %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1012
 #, 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"
+msgid "Preparing to completely remove %s"
+msgstr "正在準備完整移除 %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, 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"
+msgid "Completely removed %s"
+msgstr "已完整移除 %s"
 
-#: ftparchive/override.cc:178
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
 #, 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 需��壓縮動作"
+msgid "Can not write log (%s)"
+msgstr "無法寫入 %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "無法建立 FILE*"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork 時失敗"
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "壓縮�程�"
+#: apt-pkg/deb/dpkgpm.cc:1625
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "內部錯誤，無法建立 %s"
+#: apt-pkg/deb/dpkgpm.cc:1687
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "和�程�/檔案 IO 失敗"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1692
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "在計算 MD5 時無法讀�到資料"
+#: apt-pkg/deb/dpkgpm.cc:1694
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "在�消 %s 的連�時發生�題"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:47
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1707
 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"
+"No apport report written because the error message indicates a out of memory "
+"error"
 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 "未知的套件記錄�"
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: apt-pkg/deb/dpkgpm.cc:1742
 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"
+"No apport report written because the error message indicates a dpkg I/O error"
 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"
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "內部錯誤，AllUpgrade 造�了�壞"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s 並�是正確的 DEB 套件。"
diff --git a/prepare-release b/prepare-release
index 3c81a21cb..1b8f1e49e 100755
--- a/prepare-release
+++ b/prepare-release
@@ -69,6 +69,23 @@ elif [ "$1" = 'post-build' ]; then
 
 	dpkg-checkbuilddeps -d 'libxml2-utils'
 
+	HEADERBLUEPRINT="$(mktemp)"
+	sed -n '1,/^$/p' doc/apt.8.xml > "$HEADERBLUEPRINT"
+	find doc -mindepth 1 -maxdepth 1 -type f -name '*.xml' | while read FILE; do
+		if ! sed -n '1,/^$/p' "$FILE" | cmp "$HEADERBLUEPRINT" - >/dev/null 2>&1; then
+			echo >&2 "WARNING: Manpage $FILE has not the usual header! (see diff below)"
+			sed -n '1,/^$/p' "$FILE" | diff -u "$HEADERBLUEPRINT" - || true
+		fi
+	done
+	sed -n '1,/^$/p' doc/guide.dbk > "$HEADERBLUEPRINT"
+	find doc -mindepth 1 -maxdepth 1 -type f -name '*.dbk' | while read FILE; do
+		if ! sed -n '1,/^$/p' "$FILE" | cmp "$HEADERBLUEPRINT" - >/dev/null 2>&1; then
+			echo >&2 "WARNING: Documentation $FILE has not the usual header (see diff below)!"
+			sed -n '1,/^$/p' "$FILE" | diff -u "$HEADERBLUEPRINT" - || true
+		fi
+	done
+	rm "$HEADERBLUEPRINT"
+
 	# 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
@@ -105,6 +122,7 @@ elif [ "$1" = 'buildlog' ]; then
 	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 ',')
+	apt-get install -q --no-install-recommends $(sed -n 's#^Depends: .*@, \(.*\)$#\1#p' debian/tests/control | tr -d ',')
 else
 	echo >&1 "Usage:\t$0 pre-export
 \t$0 post-build
diff --git a/test/Makefile b/test/Makefile
index 74bffccb7..35a0a51e3 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -7,7 +7,7 @@ ifndef NOISY
 endif
 
 .PHONY: startup headers library clean veryclean all binary program doc test update-po
-startup all clean veryclean binary program dirs test update-po manpages debiandoc:
+startup all clean veryclean binary program dirs test update-po manpages docbook:
 	$(MAKE) -C libapt $@
 	$(MAKE) -C interactive-helper $@
 
diff --git a/test/integration/Packages-bug-lp1347721-dpkg-ordering b/test/integration/Packages-bug-lp1347721-dpkg-ordering
new file mode 100644
index 000000000..ea96b387c
--- /dev/null
+++ b/test/integration/Packages-bug-lp1347721-dpkg-ordering
@@ -0,0 +1,445 @@
+Package: init
+xEssential: yes
+Priority: required
+Section: metapackages
+Installed-Size: 29
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: pkg-systemd-maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
+Architecture: i386
+Source: init-system-helpers
+Version: 1.20
+Pre-Depends: sysvinit-core | systemd-sysv | upstart
+Filename: pool/main/i/init-system-helpers/init_1.20_i386.deb
+Size: 3494
+MD5sum: a388b6f4f6ed0d01b3d459cfad6582fe
+SHA1: d0eb6414a6bb48bb886fcc19962f6a7f302977f3
+SHA256: 9f299b2bf18d6e4534f3a73cca97ef93850e1b5fa38f8519da7c2b825d581f4c
+Description: System-V-like init utilities - metapackage
+Description-md5: e52554c23609041bfbca72fe27a132f9
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+
+Package: libudev1
+Priority: required
+Section: libs
+Installed-Size: 132
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
+Architecture: i386
+Source: systemd
+Version: 208-6ubuntu2
+Depends: libc6 (>= 2.17), libselinux1 (>= 1.32)
+Pre-Depends: multiarch-support
+Filename: pool/main/s/systemd/libudev1_208-6ubuntu2_i386.deb
+Size: 36008
+MD5sum: b03338c052438a95919b9db4d6f9493e
+SHA1: a85242bfc653255b5fa73d0fbec92815dc9c09fc
+SHA256: d66d7948703b33bd617e16a1b9ac6f24ca564312890b1f9218330f638080a307
+Description: libudev shared library
+Multi-Arch: same
+Homepage: http://www.freedesktop.org/wiki/Software/systemd
+Description-md5: ace5b83d7b48187416c90173a93255b6
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: udev
+Priority: required
+Section: admin
+Installed-Size: 5879
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
+Architecture: i386
+Source: systemd
+Version: 208-6ubuntu2
+Depends: libacl1 (>= 2.2.51-8), libblkid1 (>= 2.19.1), libc6 (>= 2.17), libkmod2 (>= 5~), libselinux1 (>= 2.0.65), libudev1 (= 208-6ubuntu2), lsb-base (>= 4.1+Debian11ubuntu7), util-linux (>= 2.16), procps
+Pre-Depends: debconf (>= 1.4.69) | debconf-2.0
+Breaks: consolekit (<< 0.4.6-1)
+Filename: pool/main/s/systemd/udev_208-6ubuntu2_i386.deb
+Size: 799582
+MD5sum: 814bb3babdbe76994ce536384ca31f88
+SHA1: bbb662c89f2b1ff4fd450d1523cc21b5b1c339bc
+SHA256: e444350214c5c121b2ca8031f76c53809f95ebb5c4cec4cf4595c7520ac09529
+Description: /dev/ and hotplug management daemon
+Multi-Arch: foreign
+Homepage: http://www.freedesktop.org/wiki/Software/systemd
+Description-md5: e875ddb09f46f1f7672af537f0c875ca
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: initscripts
+Priority: required
+Section: admin
+Installed-Size: 246
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Debian sysvinit maintainers <pkg-sysvinit-devel@lists.alioth.debian.org>
+Architecture: i386
+Source: sysvinit
+Version: 2.88dsf-41ubuntu16
+Replaces: libc0.1, libc0.3, libc6, libc6.1
+Depends: libc6 (>= 2.4), mount (>= 2.11x-1), debianutils (>= 4), lsb-base (>= 4.1+Debian11ubuntu7), sysvinit-utils (>= 2.86.ds1-64), sysv-rc | file-rc, coreutils (>= 5.93), passwd, init, mountall (>= 2.28)
+Recommends: psmisc, e2fsprogs
+Conflicts: libdevmapper1.02.1 (<< 2:1.02.24-1)
+Breaks: aide (<< 0.15.1-5), atm-tools (<< 1:2.5.1-1.3), bootchart (<< 0.10~svn407-3.3), console-common (<< 0.7.86), cruft (<< 0.9.16), eepc-acpi-scripts (<< 1.1.12), fcheck (<< 2.7.59-16), hostapd (<< 1:0.7.3-3), hostname (<< 2.95ubuntu1~boot2), ifupdown (<< 0.6.8ubuntu27), libpam-mount (<< 2.13-1), ltsp-client-core (<< 5.2.16-1), mdadm (<< 3.2.2-1), nbd-client (<< 1:2.9.23-1), nfs-common (<< 1:1.2.5-3), portmap (<< 6.0.0-2), readahead-fedora (<< 2:1.5.6-3), resolvconf (<< 1.49), rpcbind (<< 0.2.0-7), rsyslog (<< 5.8.2-2), selinux-policy-default (<= 2:0.2.20100524-9), splashy (<< 0.3.13-5.1+b1), sysklogd (<< 1.5-6.2), udev (<< 146-2~boot6), upstart (<< 0.6.3-2~boot4), wpasupplicant (<< 0.7.3-4), xymon (<< 4.3.0~beta2.dfsg-9)
+Filename: pool/main/s/sysvinit/initscripts_2.88dsf-41ubuntu16_i386.deb
+Size: 35150
+MD5sum: e78f1e7816f03ded97eacd469505ea45
+SHA1: 81f88f9258c680e9983316d75baff7572ecec75c
+SHA256: 996e4d86486cbe12a7b7852ec1a9fe459dbf0afab51dc13bd701b6d970fdc14a
+Description: scripts for initializing and shutting down the system
+Multi-Arch: foreign
+Homepage: http://savannah.nongnu.org/projects/sysvinit
+Description-md5: db9003c179cd2a623493209da58ea2ea
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: libc6
+Priority: required
+Section: libs
+Installed-Size: 9284
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
+Architecture: i386
+Source: glibc
+Version: 2.19-4ubuntu1
+Replaces: libc6-i386, libc6-xen
+Provides: glibc-2.19-1, libc6-i686, libc6-xen
+Depends: libgcc1
+Suggests: glibc-doc, debconf | debconf-2.0, locales
+Conflicts: libc6-xen, prelink (<= 0.0.20090311-1), tzdata (<< 2007k-1), tzdata-etch
+Breaks: hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3), nscd (<< 2.19)
+Filename: pool/main/g/glibc/libc6_2.19-4ubuntu1_i386.deb
+Size: 4012440
+MD5sum: 946665711bb0294bd2c7729b3174ba8b
+SHA1: 063e268e0d1e368e218d450a4bd2af7608b5e38e
+SHA256: 0e33f5c3b6da3a6ec52fb0274abfa0da5489808feb220b6e6640432cb84f948f
+Description: GNU C Library: Shared libraries
+Multi-Arch: same
+Homepage: http://www.gnu.org/software/libc/libc.html
+Description-md5: fc3001b0b90a1c8e6690b283a619d57f
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: libmount1
+Priority: required
+Section: libs
+Installed-Size: 253
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: LaMont Jones <lamont@debian.org>
+Architecture: i386
+Source: util-linux
+Version: 2.20.1-5.1ubuntu21
+Depends: libblkid1 (>= 2.17.2), libc6 (>= 2.8), libselinux1 (>= 1.32)
+Pre-Depends: multiarch-support
+Filename: pool/main/u/util-linux/libmount1_2.20.1-5.1ubuntu21_i386.deb
+Size: 60156
+MD5sum: d17af590ad06ac914a1024d54184cee6
+SHA1: 6eb2a281c409bd5181ce6b871795f8e4609565bc
+SHA256: 78ce54b9f644c365b95a7230e1e50762d628c9d0d3549211017a98d4cb5013c4
+Description: block device id library
+Multi-Arch: same
+Homepage: http://userweb.kernel.org/~kzak/util-linux/
+Description-md5: 8f605597a2fb2fd7bffd09db537dd040
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: libplymouth4
+Priority: required
+Section: libs
+Installed-Size: 315
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Source: plymouth
+Version: 0.9.0-0ubuntu2
+Replaces: plymouth (<< 0.7.0+git20090207-0ubuntu0.1~ppa4)
+Depends: libc6 (>= 2.9), libpng12-0 (>= 1.2.13-4), libudev1 (>= 183)
+Pre-Depends: multiarch-support
+Breaks: casper (= 1.227), mountall (<< 2.8)
+Filename: pool/main/p/plymouth/libplymouth4_0.9.0-0ubuntu2_i386.deb
+Size: 85024
+MD5sum: 8d9e7001ba371bd802956de1e81d1997
+SHA1: 749bdaee4d8bd4c2383c703eb244caa473180d35
+SHA256: 59bd4492b6e71eee5c13ba9c63da12ece49c43106829556722ca503867ce7251
+Description: graphical boot animation and logger - shared libraries
+Multi-Arch: same
+Description-md5: 29e2ed45f3e127c38b58dae52061cc33
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: libprocps3
+Priority: required
+Section: libs
+Installed-Size: 133
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Craig Small <csmall@debian.org>
+Architecture: i386
+Source: procps
+Version: 1:3.3.9-1ubuntu5
+Replaces: procps (<< 1:3.3.2-1)
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Filename: pool/main/p/procps/libprocps3_3.3.9-1ubuntu5_i386.deb
+Size: 30078
+MD5sum: 0df60f591dfe64ed23bb1f3a1546c0ce
+SHA1: db672ec37e88574bf1a1d5484d80cfd4ff04f9f6
+SHA256: b5df28501805a6833dc78e049159a7c560af6f24f18f51459bd8890c31e0fdc6
+Description: library for accessing process information from /proc
+Multi-Arch: same
+Homepage: http://gitorious.org/procps
+Description-md5: 195f4a1a493350f6f0732a65b3cda83f
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: libudev1
+Priority: required
+Section: libs
+Installed-Size: 131
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
+Architecture: i386
+Source: systemd
+Version: 204-14ubuntu2
+Depends: libc6 (>= 2.17), libcgmanager0, libdbus-1-3 (>= 1.0.2), libnih-dbus1 (>= 1.0.0), libnih1 (>= 1.0.0)
+Pre-Depends: multiarch-support
+Filename: pool/main/s/systemd/libudev1_204-14ubuntu2_i386.deb
+Size: 35518
+MD5sum: a606f9e4aab028b9ab658b6e8a09d5fb
+SHA1: ef28d377e6cc8f1e98dd9cd8c40edda90e2eed20
+SHA256: c02c85725f64b6c804235329166bf66e40da948d96123336ec55e13e1654720f
+Description: libudev shared library
+Multi-Arch: same
+Homepage: http://www.freedesktop.org/wiki/Software/systemd
+Description-md5: ace5b83d7b48187416c90173a93255b6
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: lsb-base
+Priority: required
+Section: misc
+Installed-Size: 83
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Debian LSB Team <debian-lsb@lists.debian.org>
+Architecture: all
+Source: lsb
+Version: 4.1+Debian11ubuntu8
+Replaces: upstart (<< 1.12.1-0ubuntu8)
+Breaks: upstart (<< 1.12.1-0ubuntu8)
+Filename: pool/main/l/lsb/lsb-base_4.1+Debian11ubuntu8_all.deb
+Size: 13094
+MD5sum: 9ec51f910e6d8e86bfb489b71b237e66
+SHA1: 8091ba9ffc03999a3db1e2e0ee7d32ac5139a942
+SHA256: be8d24447147aa997b79353eaf8732b3d0967118c011b47476c841667eb15f7e
+Description: Linux Standard Base 4.1 init script functionality
+Multi-Arch: foreign
+Homepage: http://www.linuxfoundation.org/collaborate/workgroups/lsb
+Description-md5: 4ebb3d88f9f483751e70c55779c52d01
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: mount
+Essential: yes
+Priority: required
+Section: admin
+Installed-Size: 410
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: LaMont Jones <lamont@debian.org>
+Architecture: i386
+Source: util-linux
+Version: 2.20.1-5.1ubuntu21
+Pre-Depends: libblkid1 (>= 2.20.1), libc6 (>= 2.8), libmount1 (>= 2.20.1), libselinux1 (>= 2.0.15)
+Suggests: nfs-common (>= 1:1.1.0-13)
+Filename: pool/main/u/util-linux/mount_2.20.1-5.1ubuntu21_i386.deb
+Size: 112598
+MD5sum: bdff5dbfbf17e2be281d64e2e7a4912b
+SHA1: 1ed4abb0d5de8a09c704ac2d33de123015e5318a
+SHA256: d2f023c763f7b6e91f3cd14073bfc5af7e7bfe3922fc5ca681d8038c80323f9e
+Description: Tools for mounting and manipulating filesystems
+Multi-Arch: foreign
+Homepage: http://userweb.kernel.org/~kzak/util-linux/
+Description-md5: 46eb8e09a600d5eb98b6b40428349102
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: mountall
+Priority: required
+Section: admin
+Installed-Size: 248
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Steve Langasek <vorlon@debian.org>
+Architecture: i386
+Version: 2.54build1
+Replaces: upstart (<< 0.6.3-2)
+Depends: makedev, udev, plymouth, coreutils (>= 7.1), libc6 (>= 2.9), libdbus-1-3 (>= 1.2.16), libnih-dbus1 (>= 1.0.0), libnih1 (>= 1.0.0), libplymouth4 (>= 0.8.1-3), libudev1 (>= 183)
+Pre-Depends: dpkg (>= 1.15.7.2)
+Breaks: initscripts (<< 2.88dsf-24), policycoreutils (<< 2.0.69-2ubuntu4), usplash (<< 0.5.47)
+Filename: pool/main/m/mountall/mountall_2.54build1_i386.deb
+Size: 54166
+MD5sum: a208d9dc5aef018087d5e00cea7f6c92
+SHA1: 13686aa81ebef6c3009ff618708d76bc68ff94e8
+SHA256: dee359411cd7cfad19581f380af6275d46a6c5ecf55f512523b75adaa4734d03
+Description: filesystem mounting tool
+Multi-Arch: foreign
+Description-md5: b5b5a27fc0e8063ef1226a39fb8ecf70
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: procps
+Priority: required
+Section: admin
+Installed-Size: 634
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Craig Small <csmall@debian.org>
+Architecture: i386
+Version: 1:3.3.9-1ubuntu5
+Provides: watch
+Depends: libc6 (>= 2.15), libncurses5 (>= 5.5-5~), libncursesw5 (>= 5.6+20070908), libprocps3, libtinfo5, lsb-base (>= 4.1+Debian11ubuntu7), initscripts
+Recommends: psmisc
+Conflicts: pgrep (<< 3.3-5), w-bassman (<< 1.0-3)
+Breaks: guymager (<= 0.5.9-1), open-vm-tools (<= 2011.12.20-562307-1), xmem (<= 1.20-27.1)
+Filename: pool/main/p/procps/procps_3.3.9-1ubuntu5_i386.deb
+Size: 203368
+MD5sum: 17be371891f077e04075c6eb0af06b3c
+SHA1: a5c6171b5a6430aa9436e42f0e64226dd2e7a665
+SHA256: 41e03fd2d05161c402d9a5d2b5feecb30a42f8919eb43712ebdd4340433803c1
+Description: /proc file system utilities
+Multi-Arch: foreign
+Homepage: http://gitorious.org/procps
+Description-md5: 943f3288c1aaa379fca73a3ff1a35278
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: sysv-rc
+Priority: required
+Section: admin
+Installed-Size: 224
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Debian sysvinit maintainers <pkg-sysvinit-devel@lists.alioth.debian.org>
+Architecture: all
+Source: sysvinit
+Version: 2.88dsf-41ubuntu16
+Replaces: file-rc
+Depends: debconf (>= 0.5) | debconf-2.0, sysvinit-utils (>= 2.86.ds1-62), insserv (>> 1.12.0-10)
+Recommends: lsb-base (>= 3.2-14)
+Suggests: sysv-rc-conf, bum
+Conflicts: file-rc
+Breaks: initscripts (<< 2.88dsf-41ubuntu14)
+Filename: pool/main/s/sysvinit/sysv-rc_2.88dsf-41ubuntu16_all.deb
+Size: 37784
+MD5sum: e57bc9887432f76266d7bf741cf9d813
+SHA1: 446d24cc86bdb7a779856c00f9dea966227a00e2
+SHA256: 072d2745b9c966d63cba5abf52357374e7a043b3cc1bbde0b8ccf68f82e45f60
+Description: System-V-like runlevel change mechanism
+Multi-Arch: foreign
+Homepage: http://savannah.nongnu.org/projects/sysvinit
+Description-md5: 195f2d617082a23f37cee0f50784eef9
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: sysvinit-utils
+Priority: required
+Section: admin
+Installed-Size: 236
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Debian sysvinit maintainers <pkg-sysvinit-devel@lists.alioth.debian.org>
+Architecture: i386
+Source: sysvinit
+Version: 2.88dsf-41ubuntu16
+Replaces: last, sysvinit (<= 2.86.ds1-65)
+Depends: libc6 (>= 2.15), libselinux1 (>= 1.32), lsb-base (>= 4.1+Debian11ubuntu7)
+Recommends: upstart (>= 0.6.3-4)
+Suggests: bootlogd, sash
+Conflicts: chkconfig (<< 11.0-79.1-2), last, sysvconfig
+Breaks: upstart (<< 1.5-0ubuntu5)
+Filename: pool/main/s/sysvinit/sysvinit-utils_2.88dsf-41ubuntu16_i386.deb
+Size: 49652
+MD5sum: e1340ba69c7a5f0cf1a84b3f68993570
+SHA1: 7cbd535c1c010c2e84cb454562fb6632fb366ddc
+SHA256: 576c2bcfbf56871acd68576f07fd18b6bfccd8a5db6dfa04bcf62183f43e77a0
+Description: System-V-like utilities
+Multi-Arch: foreign
+Homepage: http://savannah.nongnu.org/projects/sysvinit
+Description-md5: 1d2bc4c9c32104729144c7578ecd30bd
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: udev
+Priority: required
+Section: admin
+Installed-Size: 5123
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
+Architecture: i386
+Source: systemd
+Version: 204-14ubuntu2
+Depends: libacl1 (>= 2.2.51-8), libblkid1 (>= 2.19.1), libc6 (>= 2.17), libcgmanager0, libdbus-1-3 (>= 1.0.2), libkmod2 (>= 5~), libnih-dbus1 (>= 1.0.0), libnih1 (>= 1.0.0), libselinux1 (>= 2.0.65), libudev1 (= 204-14ubuntu2), lsb-base (>= 4.1+Debian11ubuntu7), util-linux (>= 2.16), procps
+Pre-Depends: debconf (>= 1.4.69) | debconf-2.0
+Breaks: consolekit (<< 0.4.6-1)
+Filename: pool/main/s/systemd/udev_204-14ubuntu2_i386.deb
+Size: 739026
+MD5sum: a85b035885e1b316354f6e5d0b8eeb69
+SHA1: 970405e4c8838c3cf17d1834c8917705d977879e
+SHA256: 05fbd7f4b502fde9752b84b49364fe633b8377bcd996ec16462e0bc94adc9fcf
+Description: /dev/ and hotplug management daemon
+Multi-Arch: foreign
+Homepage: http://www.freedesktop.org/wiki/Software/systemd
+Description-md5: e875ddb09f46f1f7672af537f0c875ca
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
+Package: upstart
+Priority: required
+Section: admin
+Installed-Size: 1721
+Maintainer: James Hunt <james.hunt@ubuntu.com>
+Architecture: i386
+Version: 1.13.1-0ubuntu1
+Replaces: startup-tasks, system-services, sysvinit, upstart-compat-sysv, upstart-job
+Provides: startup-tasks, system-services, upstart-compat-sysv, upstart-job
+Depends: libc6 (>= 2.15), libcgmanager0, libdbus-1-3 (>= 1.2.16), libjson-c2 (>= 0.10), libnih-dbus1 (>= 1.0.0), libnih1 (>= 1.0.0), libudev1 (>= 183), sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
+Suggests: python3, graphviz, bash-completion, upstart-monitor
+Conflicts: lxcguest, startup-tasks, system-services, sysvinit, upstart-compat-sysv, upstart-job
+Breaks: friendly-recovery (<< 0.2.13), libc6 (<< 2.12.1-0ubuntu12)
+Filename: pool/main/u/upstart/upstart_1.13.1-0ubuntu1_i386.deb
+Size: 388978
+MD5sum: 2ebf7fb1083b581707e445fee808e120
+SHA1: 901424ec0d304ca8d10a25321a55d1d69bd8e82d
+SHA256: c42fb117e90770c7163c9f4770e75e9c0d6a00d41c4b3afc2afebfa65ede80f8
+Description: event-based init daemon
+Multi-Arch: foreign
+Homepage: http://upstart.ubuntu.com/
+Orig-Maintainer: Steve Langasek <vorlon@debian.org>
+Description-md5: b776ec43b708c13dd0c2ab824471f478
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 9m
+Task: minimal
+
diff --git a/test/integration/framework b/test/integration/framework
index a687dcb35..ff010a5c4 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -4,7 +4,7 @@ EXIT_CODE=0
 
 # we all like colorful messages
 if [ "$MSGCOLOR" != 'NO' ]; then
-	if ! expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
+	if [ ! -t 1 ]; then # but check that we output to a terminal
 		export MSGCOLOR='NO'
 	fi
 fi
@@ -23,30 +23,30 @@ if [ "$MSGCOLOR" != 'NO' ]; then
 	CCMD="\033[1;35m" # pink
 fi
 
-msgdie() { echo "${CERROR}E: $1${CNORMAL}" >&2; exit 1; }
-msgwarn() { echo "${CWARNING}W: $1${CNORMAL}" >&2; }
-msgmsg() { echo "${CMSG}$1${CNORMAL}"; }
-msginfo() { echo "${CINFO}I: $1${CNORMAL}"; }
-msgdebug() { echo "${CDEBUG}D: $1${CNORMAL}"; }
-msgdone() { echo "${CDONE}DONE${CNORMAL}"; }
-msgnwarn() { echo -n "${CWARNING}W: $1${CNORMAL}" >&2; }
-msgnmsg() { echo -n "${CMSG}$1${CNORMAL}"; }
-msgninfo() { echo -n "${CINFO}I: $1${CNORMAL}"; }
-msgndebug() { echo -n "${CDEBUG}D: $1${CNORMAL}"; }
+msgdie() { printf "${CERROR}E: $1${CNORMAL}\n" >&2; exit 1; }
+msgwarn() { printf "${CWARNING}W: $1${CNORMAL}\n" >&2; }
+msgmsg() { printf "${CMSG}$1${CNORMAL}\n"; }
+msginfo() { printf "${CINFO}I: $1${CNORMAL}\n"; }
+msgdebug() { printf "${CDEBUG}D: $1${CNORMAL}\n"; }
+msgdone() { printf "${CDONE}DONE${CNORMAL}\n"; }
+msgnwarn() { printf "${CWARNING}W: $1${CNORMAL}" >&2; }
+msgnmsg() { printf "${CMSG}$1${CNORMAL}"; }
+msgninfo() { printf "${CINFO}I: $1${CNORMAL}"; }
+msgndebug() { printf "${CDEBUG}D: $1${CNORMAL}"; }
 msgtest() {
 	while [ -n "$1" ]; do
-		echo -n "${CINFO}$1${CCMD} "
-		echo -n "$(echo "$2" | sed -e 's#^apt\([cgfs]\)#apt-\1#')${CINFO} "
+		printf "${CINFO}$1${CCMD} "
+		printf -- "$(echo "$2" | sed -e 's#^apt\([cgfs]\)#apt-\1#')${CINFO} "
 		shift
 		if [ -n "$1" ]; then shift; else break; fi
 	done
-	echo -n "…${CNORMAL} "
+	printf "…${CNORMAL} "
 }
-msgpass() { echo "${CPASS}PASS${CNORMAL}"; }
-msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; }
+msgpass() { printf "${CPASS}PASS${CNORMAL}\n"; }
+msgskip() { printf "${CWARNING}SKIP${CNORMAL}\n" >&2; }
 msgfail() {
-	if [ $# -gt 0 ]; then echo "${CFAIL}FAIL: $*${CNORMAL}" >&2;
-	else echo "${CFAIL}FAIL${CNORMAL}" >&2; fi
+	if [ $# -gt 0 ]; then printf "${CFAIL}FAIL: $*${CNORMAL}\n" >&2;
+	else printf "${CFAIL}FAIL${CNORMAL}\n" >&2; fi
 	EXIT_CODE=$((EXIT_CODE+1));
 }
 
@@ -63,12 +63,12 @@ if [ $MSGLEVEL -le 2 ]; then
 	msgmsg() { true; }
 	msgnmsg() { true; }
 	msgtest() { true; }
-	msgpass() { echo -n " ${CPASS}P${CNORMAL}"; }
-	msgskip() { echo -n " ${CWARNING}S${CNORMAL}" >&2; }
+	msgpass() { printf " ${CPASS}P${CNORMAL}"; }
+	msgskip() { printf " ${CWARNING}S${CNORMAL}" >&2; }
 	if [ -n "$CFAIL" ]; then
-		msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; EXIT_CODE=$((EXIT_CODE+1)); }
+		msgfail() { printf " ${CFAIL}FAIL${CNORMAL}" >&2; EXIT_CODE=$((EXIT_CODE+1)); }
 	else
-		msgfail() { echo -n " ###FAILED###" >&2; EXIT_CODE=$((EXIT_CODE+1)); }
+		msgfail() { printf " ###FAILED###" >&2; EXIT_CODE=$((EXIT_CODE+1)); }
 	fi
 fi
 if [ $MSGLEVEL -le 3 ]; then
@@ -87,7 +87,7 @@ msgdone() {
 	   [ "$1" = "die" -a $MSGLEVEL -le 0 ]; then
 		true;
 	else
-		echo "${CDONE}DONE${CNORMAL}";
+		printf "${CDONE}DONE${CNORMAL}\n";
 	fi
 }
 getaptconfig() {
@@ -155,7 +155,7 @@ exitwithstatus() {
 shellsetedetector() {
 	local exit_status=$?
 	if [ "$exit_status" != '0' ]; then
-		echo >&2 "${CERROR}E: Looks like the testcases ended prematurely with exitcode: ${exit_status}${CNORMAL}"
+		printf >&2 "${CERROR}E: Looks like the testcases ended prematurely with exitcode: ${exit_status}${CNORMAL}\n"
 		if [ "$EXIT_CODE" = '0' ]; then
 			EXIT_CODE="$exit_status"
 		fi
@@ -328,12 +328,12 @@ configdpkg() {
 configcompression() {
 	while [ -n "$1" ]; do
 		case "$1" in
-		'.') echo ".\t.\tcat";;
-		'gz') echo "gzip\tgz\tgzip";;
-		'bz2') echo "bzip2\tbz2\tbzip2";;
-		'lzma') echo "lzma\tlzma\txz --format=lzma";;
-		'xz') echo "xz\txz\txz";;
-		*) echo "$1\t$1\t$1";;
+		'.') printf ".\t.\tcat\n";;
+		'gz') printf "gzip\tgz\tgzip\n";;
+		'bz2') printf "bzip2\tbz2\tbzip2\n";;
+		'lzma') printf "lzma\tlzma\txz --format=lzma\n";;
+		'xz') printf "xz\txz\txz\n";;
+		*) printf "$1\t$1\t$1\n";;
 		esac
 		shift
 	done > ${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf
@@ -1019,7 +1019,13 @@ testfileequal() {
 
 testempty() {
 	msgtest "Test for no output of" "$*"
-	test -z "$($* 2>&1)" && msgpass || msgfail
+	local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testempty.comparefile"
+	if $* >$COMPAREFILE 2>&1 && test ! -s $COMPAREFILE; then
+		msgpass
+	else
+		cat $COMPAREFILE
+		msgfail
+	fi
 }
 
 testequal() {
diff --git a/test/integration/run-tests b/test/integration/run-tests
index d39daeee5..c39a2ac68 100755
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -22,7 +22,7 @@ done
 export MSGLEVEL="${MSGLEVEL:-3}"
 
 if [ "$MSGCOLOR" != 'NO' ]; then
-	if ! expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
+	if [ ! -t 1 ]; then # but check that we output to a terminal
 		export MSGCOLOR='NO'
 	fi
 fi
@@ -39,9 +39,9 @@ fi
 TOTAL="$(run-parts --list $DIR | grep '/test-' | wc -l)"
 for testcase in $(run-parts --list $DIR | grep '/test-'); do
 	if [ "$MSGLEVEL" -le 2 ]; then
-		echo -n "($(($ALL+1))/${TOTAL}) ${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: "
+		printf "($(($ALL+1))/${TOTAL}) ${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: "
 	else
-		echo "${CTEST}Run Testcase ($(($ALL+1))/${TOTAL}) ${CHIGH}$(basename ${testcase})${CRESET}"
+		printf "${CTEST}Run Testcase ($(($ALL+1))/${TOTAL}) ${CHIGH}$(basename ${testcase})${CRESET}\n"
 	fi
 	if ! ${testcase}; then
 		FAIL=$((FAIL+1))
diff --git a/test/integration/status-bug-lp1347721-dpkg-ordering b/test/integration/status-bug-lp1347721-dpkg-ordering
new file mode 100644
index 000000000..62e545c55
--- /dev/null
+++ b/test/integration/status-bug-lp1347721-dpkg-ordering
@@ -0,0 +1,1942 @@
+Package: libustr-1.0-1
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 261
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: ustr
+Version: 1.0.4-3ubuntu2
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Description: Micro string library: shared library
+ ustr (Micro string library) is a string API for C. It has tiny overhead over
+ just plain strdup(), is much safer, is easier to use, is faster for many
+ operations, can be used with read-only or automatically allocated data. You
+ don't even need to link to the library to use it (so there are no
+ dependencies).
+ .
+ This package contains the shared library for ustr.
+Homepage: http://www.and.org/ustr/
+Original-Maintainer: Vaclav Ovsik <vaclav.ovsik@i.cz>
+
+Package: debconf
+Status: install ok installed
+Priority: important
+Section: admin
+Installed-Size: 609
+Maintainer: Colin Watson <cjwatson@ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Version: 1.5.53ubuntu1
+Replaces: debconf-tiny
+Provides: debconf-2.0
+Pre-Depends: perl-base (>= 5.6.1-4)
+Recommends: apt-utils (>= 0.5.1), debconf-i18n
+Suggests: debconf-doc, debconf-utils, whiptail | dialog | gnome-utils, libterm-readline-gnu-perl, libgtk2-perl (>= 1:1.130), libnet-ldap-perl, perl, libqtgui4-perl, libqtcore4-perl
+Conflicts: apt (<< 0.3.12.1), cdebconf (<< 0.96), debconf-tiny, debconf-utils (<< 1.3.22), dialog (<< 0.9b-20020814-1), menu (<= 2.1.3-1), whiptail (<< 0.51.4-11), whiptail-utf8 (<= 0.50.17-13)
+Conffiles:
+ /etc/debconf.conf 8c0619be413824f1fc7698cee0f23811
+ /etc/apt/apt.conf.d/70debconf 7e9d09d5801a42b4926b736b8eeabb73
+ /etc/bash_completion.d/debconf 8fa1862734fbe54d7178aaaa419f5a11
+Description: Debian configuration management system
+ Debconf is a configuration management system for debian packages. Packages
+ use Debconf to ask questions when they are installed.
+Original-Maintainer: Debconf Developers <debconf-devel@lists.alioth.debian.org>
+
+Package: iproute2
+Status: install ok installed
+Priority: important
+Section: net
+Installed-Size: 1184
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 3.14.0-1
+Replaces: iproute
+Provides: arpd
+Depends: libc6 (>= 2.14), libdb5.3
+Recommends: libatm1 (>= 2.4.1-17~), libxtables10
+Suggests: iproute2-doc
+Conflicts: arpd, iproute (<< 20130000-1)
+Conffiles:
+ /etc/iproute2/rt_realms 7137bdf40e8d58c87ac7e3bba503767f
+ /etc/iproute2/rt_protos 95ce0b4b5b79f5a8a45941fb418a904c
+ /etc/iproute2/rt_dsfield 4264d5c7c8298300185aa04e1a736934
+ /etc/iproute2/rt_scopes 6298b8df09e9bda23ea7da49021ca457
+ /etc/iproute2/ematch_map b91e7f9b26918449bade9573f8871d61
+ /etc/iproute2/group 3aea2c0e0dd75e13a5f8f48f2936915f
+ /etc/iproute2/rt_tables a1313318d6778fe6b8c680248ef5a463
+Description: networking and traffic control tools
+ The iproute2 suite is a collection of utilities for networking and
+ traffic control.
+ .
+ These tools communicate with the Linux kernel via the (rt)netlink
+ interface, providing advanced features not available through the
+ legacy net-tools commands 'ifconfig' and 'route'.
+Original-Maintainer: Debian iproute2 Maintainers <ah-iproute@debian.org>
+Homepage: http://www.linux-foundation.org/en/Net:Iproute2
+
+Package: coreutils
+Essential: yes
+Status: install ok installed
+Priority: required
+Section: utils
+Installed-Size: 6124
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 8.21-1ubuntu5
+Replaces: mktemp, timeout
+Pre-Depends: libacl1 (>= 2.2.51-8), libattr1 (>= 1:2.4.46-8), libc6 (>= 2.17), libselinux1 (>= 1.32)
+Conflicts: timeout
+Description: GNU core utilities
+ This package contains the basic file, shell and text manipulation
+ utilities which are expected to exist on every operating system.
+ .
+ Specifically, this package includes:
+ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp
+ csplit cut date dd df dir dircolors dirname du echo env expand expr
+ factor false flock fmt fold groups head hostid id install join link ln
+ logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup nproc od
+ paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir runcon
+ sha*sum seq shred sleep sort split stat stty sum sync tac tail tee test
+ timeout touch tr true truncate tsort tty uname unexpand uniq unlink
+ users vdir wc who whoami yes
+Homepage: http://gnu.org/software/coreutils
+Original-Maintainer: Michael Stone <mstone@debian.org>
+
+Package: debianutils
+Essential: yes
+Status: install ok installed
+Priority: required
+Section: utils
+Installed-Size: 273
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 4.4
+Replaces: manpages-pl (<< 1:0.5)
+Depends: sensible-utils
+Pre-Depends: libc6 (>= 2.15)
+Description: Miscellaneous utilities specific to Debian
+ This package provides a number of small utilities which are used
+ primarily by the installation scripts of Debian packages, although
+ you may use them directly.
+ .
+ The specific utilities included are:
+ add-shell installkernel ischroot remove-shell run-parts savelog
+ tempfile which
+Original-Maintainer: Clint Adams <clint@debian.org>
+
+Package: initramfs-tools
+Status: install ok installed
+Priority: optional
+Section: utils
+Installed-Size: 365
+Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Version: 0.103ubuntu4
+Provides: linux-initramfs-tool
+Depends: initramfs-tools-bin (>= 0.103ubuntu4), initramfs-tools-bin (<< 0.103ubuntu4.1~), klibc-utils (>= 2.0-1~), busybox-initramfs (>= 1:1.13.3-1ubuntu5), cpio, module-init-tools, udev (>= 147~-5), findutils (>= 4.2.24), util-linux (>> 2.15~rc1)
+Suggests: bash-completion
+Breaks: cryptsetup (<< 2:1.1.0-2.1), elilo (<< 3.12-3.1~), lilo (<< 22.8-8.2~), mountall (<< 2.0~), s390-tools (<< 1.8.3-2~)
+Conflicts: usplash (<< 0.5.50)
+Conffiles:
+ /etc/bash_completion.d/initramfs-tools 7eeb7184772f3658e7cf446945c096b1
+ /etc/initramfs-tools/update-initramfs.conf e2026d4603e7161efaccca519aeb1297
+ /etc/initramfs-tools/initramfs.conf 8801535d9bec98754eea6a172f956d42
+ /etc/kernel/postrm.d/initramfs-tools e22d1ab0d7a7a1b66ae6d71ea4f21938
+ /etc/kernel/postinst.d/initramfs-tools fe7713b9a74a10ed71d1e7dd93afc209
+Description: tools for generating an initramfs
+ This package contains tools to create and boot an initramfs for packaged 2.6
+ Linux kernel. The initramfs is a gzipped cpio archive. At boot time, the
+ kernel unpacks that archive into RAM, mounts and uses it as initial root file
+ system. The mounting of the real root file system occurs in early user space.
+ klibc provides utilities to setup root. Having the root on MD, LVM2, LUKS or
+ NFS is also supported.
+ Any boot loader with initrd support is able to load an initramfs archive.
+Original-Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
+
+Package: makedev
+Status: install ok installed
+Priority: extra
+Section: admin
+Installed-Size: 125
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Version: 2.3.1-93ubuntu1
+Depends: base-passwd (>= 3.0.4)
+Conflicts: udev (<= 0.024-7)
+Description: creates device files in /dev
+ The MAKEDEV executable is used to create device files, often in /dev.
+ .
+ Device files are special files through which applications can interact
+ with hardware.
+ .
+ This package is not necessary for most modern Linux systems, where the udev
+ subsystem provides a more dynamic mechanism for device file management.
+Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+
+Package: libdbus-1-3
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 398
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: dbus
+Version: 1.6.18-0ubuntu4
+Depends: libc6 (>= 2.10)
+Pre-Depends: multiarch-support
+Recommends: dbus
+Breaks: kde-window-manager (<< 4:4.4.5-9), kdebase-workspace-bin (<< 4:4.4.5-9)
+Description: simple interprocess messaging system (library)
+ D-Bus is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ D-Bus supports broadcast messages, asynchronous messages (thus
+ decreasing latency), authentication, and more. It is designed to be
+ low-overhead; messages are sent using a binary protocol, not using
+ XML. D-Bus also supports a method call mapping for its messages, but
+ it is not required; this makes using the system quite simple.
+ .
+ It comes with several bindings, including GLib, Python, Qt and Java.
+ .
+ The daemon can be found in the dbus package.
+Homepage: http://dbus.freedesktop.org/
+Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
+
+Package: module-init-tools
+Status: install ok installed
+Priority: extra
+Section: admin
+Installed-Size: 31
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Source: kmod
+Version: 16-2ubuntu3
+Depends: libkmod2, kmod
+Pre-Depends: dpkg (>= 1.15.7.2)
+Description: transitional dummy package (module-init-tools to kmod)
+ This dummy package is provided to support the transition from
+ module-init-tools to kmod and should be removed afterwards.
+Original-Maintainer: Marco d'Itri <md@linux.it>
+
+Package: libuuid1
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 107
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: util-linux
+Version: 2.20.1-5.1ubuntu20
+Replaces: e2fsprogs (<< 1.34-1)
+Depends: passwd, libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Recommends: uuid-runtime
+Description: Universally Unique ID library
+ The libuuid library generates and parses 128-bit universally unique
+ ids (UUIDs).  A UUID is an identifier that is unique across both
+ space and time, with respect to the space of all UUIDs.  A UUID can
+ be used for multiple purposes, from tagging objects with an extremely
+ short lifetime, to reliably identifying very persistent objects
+ across a network.
+ .
+ See RFC 4122 for more information.
+Homepage: http://userweb.kernel.org/~kzak/util-linux/
+Original-Maintainer: LaMont Jones <lamont@debian.org>
+
+Package: lsb-base
+Status: install ok installed
+Priority: required
+Section: misc
+Installed-Size: 82
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Source: lsb
+Version: 4.1+Debian11ubuntu6
+Description: Linux Standard Base 4.1 init script functionality
+ The Linux Standard Base (http://www.linuxbase.org/) is a standard
+ core system that third-party applications written for Linux can
+ depend upon.
+ .
+ This package only includes the init-functions shell library, which
+ may be used by other packages' initialization scripts for console
+ logging and other purposes.
+Homepage: http://www.linuxfoundation.org/collaborate/workgroups/lsb
+Original-Maintainer: Debian LSB Team <debian-lsb@lists.debian.org>
+
+Package: procps
+Status: install ok installed
+Priority: important
+Section: admin
+Installed-Size: 637
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 1:3.3.9-1ubuntu2
+Provides: watch
+Depends: libc6 (>= 2.15), libncurses5 (>= 5.5-5~), libncursesw5 (>= 5.6+20070908), libprocps3, libtinfo5, lsb-base (>= 3.0-10), initscripts
+Recommends: psmisc
+Breaks: guymager (<= 0.5.9-1), open-vm-tools (<= 2011.12.20-562307-1), xmem (<= 1.20-27.1)
+Conflicts: pgrep (<< 3.3-5), w-bassman (<< 1.0-3)
+Conffiles:
+ /etc/sysctl.d/10-console-messages.conf 154f6f5c5810d10bb303fb6a8e907c6a
+ /etc/sysctl.d/README c20074b9b11a5202758c69d7bcb6996f
+ /etc/sysctl.d/10-magic-sysrq.conf b3059f2835f17c97265433fdfdee358f
+ /etc/sysctl.d/10-kernel-hardening.conf 5c1388f00011a287cdeba60208c674e1
+ /etc/sysctl.d/10-link-restrictions.conf 8568316f2baa8db06554dab91f93a161
+ /etc/sysctl.d/10-zeropage.conf 8d7193abcc4dfedaf519dd03016a5e59
+ /etc/sysctl.d/10-network-security.conf 4ac7258f5336e7eeaf448c05ab668d3c
+ /etc/sysctl.d/10-ptrace.conf 47f40494b2fc698e15549e0a4a79e81c
+ /etc/sysctl.d/10-ipv6-privacy.conf e9473d12b4a7069d6a3ca8b694511ddf
+ /etc/sysctl.conf 76c1d8285c578d5e827c3e07b9738112
+ /etc/init.d/procps 021482ebab1024f5ed76e650e5191e8f
+ /etc/init/procps.conf 96170a339d08797dc90d69b01d6bf610
+Description: /proc file system utilities
+ This package provides command line and full screen utilities for browsing
+ procfs, a "pseudo" file system dynamically generated by the kernel to
+ provide information about the status of entries in its process table
+ (such as whether the process is running, stopped, or a "zombie").
+ .
+ It contains free, kill, pkill, pgrep, pmap, ps, pwdx, skill, slabtop,
+ snice, sysctl, tload, top, uptime, vmstat, w, and watch.
+Homepage: http://gitorious.org/procps
+Original-Maintainer: Craig Small <csmall@debian.org>
+
+Package: libpam0g
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 219
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: pam
+Version: 1.1.8-1ubuntu2
+Replaces: libpam0g-util
+Depends: libaudit1 (>= 1:2.2.1), libc6 (>= 2.8), debconf (>= 0.5) | debconf-2.0
+Pre-Depends: multiarch-support
+Suggests: libpam-doc
+Description: Pluggable Authentication Modules library
+ Contains the shared library for Linux-PAM, a library that enables the
+ local system administrator to choose how applications authenticate users.
+ In other words, without rewriting or recompiling a PAM-aware application,
+ it is possible to switch between the authentication mechanism(s) it uses.
+ One may entirely upgrade the local authentication system without touching
+ the applications themselves.
+Homepage: http://pam.sourceforge.net/
+Original-Maintainer: Steve Langasek <vorlon@debian.org>
+
+Package: sensible-utils
+Status: install ok installed
+Priority: required
+Section: utils
+Installed-Size: 110
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Version: 0.0.9
+Replaces: debianutils (<= 2.32.3), manpages-pl (<= 20060617-3~)
+Description: Utilities for sensible alternative selection
+ This package provides a number of small utilities which are used
+ by programs to sensibly select and spawn an appropriate browser,
+ editor, or pager.
+ .
+ The specific utilities included are: sensible-browser sensible-editor
+ sensible-pager
+Original-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+
+Package: perl-base
+Essential: yes
+Status: install ok installed
+Priority: required
+Section: perl
+Installed-Size: 4780
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Source: perl
+Version: 5.18.2-2ubuntu1
+Replaces: libperl5.8 (<< 5.8.0-20), libscalar-list-utils-perl, libsocket-perl, libxsloader-perl, perl (<< 5.10.1-12), perl-modules (<< 5.10.1-1)
+Provides: libscalar-list-utils-perl, libsocket-perl, libxsloader-perl, perl5-base, perlapi-5.18.1, perlapi-5.18.2
+Pre-Depends: libc6 (>= 2.11), dpkg (>= 1.14.20)
+Suggests: perl
+Breaks: autoconf2.13 (<< 2.13-45), libcommon-sense-perl (<< 3.72-2~), libfile-spec-perl (<< 3.4000), libmarc-charset-perl (<< 1.2), libsocket-perl (<< 2.009), libxsloader-perl (<< 0.16)
+Conflicts: defoma (<< 0.11.12), doc-base (<< 0.10.3), libscalar-list-utils-perl, mono-gac (<< 2.10.8.1-3), safe-rm (<< 0.8), update-inetd (<< 4.41)
+Description: minimal Perl system
+ Perl is a scripting language used in many system scripts and utilities.
+ .
+ This package provides a Perl interpreter and the small subset of the
+ standard run-time library required to perform basic tasks. For a full
+ Perl installation, install "perl" (and its dependencies, "perl-modules"
+ and "perl-doc").
+Original-Maintainer: Niko Tyni <ntyni@debian.org>
+Homepage: http://dev.perl.org/perl5/
+
+Package: sysv-rc
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 221
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Source: sysvinit
+Version: 2.88dsf-41ubuntu6
+Replaces: file-rc
+Depends: debconf (>= 0.5) | debconf-2.0, sysvinit-utils (>= 2.86.ds1-62), insserv (>> 1.12.0-10)
+Recommends: lsb-base (>= 3.2-14)
+Suggests: sysv-rc-conf, bum
+Breaks: initscripts (<< 2.86.ds1-63)
+Conflicts: file-rc
+Description: System-V-like runlevel change mechanism
+ This package provides support for the System-V like system
+ for booting, changing runlevels, and shutting down,
+ configured through symbolic links in /etc/rc?.d/.
+Homepage: http://savannah.nongnu.org/projects/sysvinit
+Original-Maintainer: Debian sysvinit maintainers <pkg-sysvinit-devel@lists.alioth.debian.org>
+
+Package: libprocps3
+Status: install ok installed
+Priority: important
+Section: libs
+Installed-Size: 129
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: procps
+Version: 1:3.3.9-1ubuntu2
+Replaces: procps (<< 1:3.3.2-1)
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Description: library for accessing process information from /proc
+ The libprocps library is a way of accessing information out of the /proc
+ filesystem.
+ .
+ This package contains the shared libraries necessary to run programs
+ compilied with libprocps.
+Homepage: http://gitorious.org/procps
+Original-Maintainer: Craig Small <csmall@debian.org>
+
+Package: libjson-c2
+Status: install ok installed
+Priority: extra
+Section: libs
+Installed-Size: 82
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: json-c
+Version: 0.11-4ubuntu1
+Depends: libc6 (>= 2.8)
+Pre-Depends: multiarch-support
+Description: JSON manipulation library - shared library
+ This library allows you to easily construct JSON objects in C,
+ output them as JSON formatted strings and parse JSON formatted
+ strings back into the C representation of JSON objects.
+Homepage: https://github.com/json-c/json-c/wiki
+Original-Maintainer: fabien boucher <fabien.dot.boucher@gmail.com>
+
+Package: libdrm2
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 105
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: libdrm
+Version: 2.4.53-1
+Depends: libc6 (>= 2.17)
+Pre-Depends: multiarch-support
+Description: Userspace interface to kernel DRM services -- runtime
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for "Direct Rendering Manager", which is the
+ kernelspace portion of the "Direct Rendering Infrastructure" (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
+ .
+ This package provides the runtime environment for libdrm.
+Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+
+Package: libsepol1
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 322
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: libsepol
+Version: 2.2-1
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Description: SELinux library for manipulating binary security policies
+ Security-enhanced Linux is a patch of the Linux kernel and a number
+ of utilities with enhanced security functionality designed to add
+ mandatory access controls to Linux.  The Security-enhanced Linux
+ kernel contains new architectural components originally developed to
+ improve the security of the Flask operating system. These
+ architectural components provide general support for the enforcement
+ of many kinds of mandatory access control policies, including those
+ based on the concepts of Type Enforcement®, Role-based Access
+ Control, and Multi-level Security.
+ .
+ libsepol provides an API for the manipulation of SELinux binary policies.
+ It is used by checkpolicy (the policy compiler) and similar tools, as well
+ as by programs like load_policy that need to perform specific transformations
+ on binary policies such as customizing policy boolean settings.
+Original-Maintainer: Debian SELinux maintainers <selinux-devel@lists.alioth.debian.org>
+Homepage: http://userspace.selinuxproject.org/
+
+Package: libpam-modules
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 764
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: pam
+Version: 1.1.8-1ubuntu2
+Replaces: libpam-umask, libpam0g-util
+Provides: libpam-mkhomedir, libpam-motd, libpam-umask
+Pre-Depends: libaudit1 (>= 1:2.2.1), libc6 (>= 2.15), libdb5.3, libpam0g (>= 1.1.3-2), libselinux1 (>= 2.1.9), debconf (>= 0.5) | debconf-2.0, libpam-modules-bin (= 1.1.8-1ubuntu2)
+Conflicts: libpam-mkhomedir, libpam-motd, libpam-umask
+Conffiles:
+ /etc/security/limits.conf 11c27ba00b7bd6a255f33126f75c5005
+ /etc/security/group.conf f1e26e8db6f7abd2d697d7dad3422c36
+ /etc/security/access.conf 13ec4d189f0ed9acf3433977a53d446b
+ /etc/security/pam_env.conf ddee4a931170dc21b4e0b9bb28e02a7b
+ /etc/security/namespace.init b46b23d64860d1557d2a8f44b231fd54
+ /etc/security/time.conf 06e05c6079e839c8833ac7c3abfde192
+ /etc/security/sepermit.conf d41c74654734a5c069a37bfc02f0a6d4
+ /etc/security/namespace.conf 6424c99a62ddf4b7d3ca713bb06ded89
+Description: Pluggable Authentication Modules for PAM
+ This package completes the set of modules for PAM. It includes the
+  pam_unix.so module as well as some specialty modules.
+Homepage: http://pam.sourceforge.net/
+Original-Maintainer: Steve Langasek <vorlon@debian.org>
+
+Package: tzdata
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 1599
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Version: 2014b-1
+Replaces: libc0.1, libc0.3, libc6, libc6.1
+Provides: tzdata-jessie
+Depends: debconf (>= 0.5) | debconf-2.0
+Description: time zone and daylight-saving time data
+ This package contains data required for the implementation of
+ standard local time for many representative locations around the
+ globe. It is updated periodically to reflect changes made by
+ political bodies to time zone boundaries, UTC offsets, and
+ daylight-saving rules.
+Original-Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
+Homepage: http://www.iana.org/time-zones
+
+Package: libudev1
+Status: install ok installed
+Priority: important
+Section: libs
+Installed-Size: 129
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: systemd
+Version: 204-10ubuntu1
+Depends: libc6 (>= 2.17), libcgmanager0, libdbus-1-3 (>= 1.0.2), libnih-dbus1 (>= 1.0.0), libnih1 (>= 1.0.0)
+Pre-Depends: multiarch-support
+Description: libudev shared library
+ This library provides access to udev device information.
+Homepage: http://www.freedesktop.org/wiki/Software/systemd
+Original-Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
+
+Package: ifupdown
+Status: install ok installed
+Priority: important
+Section: admin
+Installed-Size: 229
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 0.7.48.1ubuntu1
+Replaces: netbase (<< 5.0)
+Depends: iproute2 | iproute (>= 20071016-1), libc6 (>= 2.7), sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.16), lsb-base (>= 4.1+Debian3), initscripts (>= 2.88dsf-25), adduser
+Recommends: isc-dhcp-client | dhcp-client
+Suggests: ppp, rdnssd, net-tools
+Breaks: dhcp3-client (<< 4.0), netbase (<< 5.0)
+Conffiles:
+ /etc/network/if-up.d/upstart dfbcde4fd4a3a2553930605e03e160ab
+ /etc/network/if-down.d/upstart 1a0205ddbc1446782a8d4d818e97d8a5
+ /etc/init/network-interface-container.conf 4daa570594afc50940f140a7731d20d1
+ /etc/init/networking.conf c50811e19bcd596d99b0467b40cfbb8b
+ /etc/init/network-interface.conf aae12345eba8e946579b06798b1752c1
+ /etc/init/network-interface-security.conf feb6b4b52fe24c44ff1bc68addf245d6
+ /etc/init.d/networking 2c8c3be8b90f99de7edf0f883ebe39f3
+ /etc/default/networking 35cd4a2713981c9239ce4532c1bfc1c7
+Description: high level tools to configure network interfaces
+ This package provides the tools ifup and ifdown which may be used to
+ configure (or, respectively, deconfigure) network interfaces based on
+ interface definitions in the file /etc/network/interfaces.
+Original-Maintainer: Andrew Shadura <andrewsh@debian.org>
+
+Package: libsemanage1
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 261
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: libsemanage
+Version: 2.2-1ubuntu1
+Depends: libsemanage-common (= 2.2-1ubuntu1), libaudit1 (>= 1:2.2.1), libbz2-1.0, libc6 (>= 2.8), libselinux1 (>= 2.1.12), libsepol1 (>= 2.1.4), libustr-1.0-1 (>= 1.0.4)
+Pre-Depends: multiarch-support
+Description: SELinux policy management library
+ This package provides the shared libraries for SELinux policy management.
+ It uses libsepol for binary policy manipulation and libselinux for
+ interacting with the SELinux system.  It also exec's helper programs
+ for loading policy and for checking whether the file_contexts
+ configuration is valid (load_policy and setfiles from
+ policycoreutils) presently, although this may change at least for the
+ bootstrapping case
+ .
+ Security-enhanced Linux is a patch of the Linux kernel and a
+ number of utilities with enhanced security functionality designed to
+ add mandatory access controls to Linux.  The Security-enhanced Linux
+ kernel contains new architectural components originally developed to
+ improve the security of the Flask operating system. These
+ architectural components provide general support for the enforcement
+ of many kinds of mandatory access control policies, including those
+ based on the concepts of Type Enforcement, Role-based Access
+ Control, and Multi-level Security.
+Original-Maintainer: Debian SELinux maintainers <selinux-devel@lists.alioth.debian.org>
+Homepage: http://userspace.selinuxproject.org/
+
+Package: mountall
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 248
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 2.53
+Replaces: upstart (<< 0.6.3-2)
+Depends: makedev, udev, plymouth, coreutils (>= 7.1), libc6 (>= 2.9), libdbus-1-3 (>= 1.2.16), libnih-dbus1 (>= 1.0.0), libnih1 (>= 1.0.0), libplymouth2 (>= 0.8.1-3), libudev1 (>= 183)
+Pre-Depends: dpkg (>= 1.15.7.2)
+Breaks: initscripts (<< 2.88dsf-24), policycoreutils (<< 2.0.69-2ubuntu4), usplash (<< 0.5.47)
+Conffiles:
+ /etc/init/checkroot.sh.conf 3ea7f6ba450f431fd239e2b53a805216
+ /etc/init/mounted-dev.conf cf7bea42235e77168c996d774f059c44
+ /etc/init/mounted-tmp.conf 289fa57d726885147a41b2b1f3695a29
+ /etc/init/mountdevsubfs.sh.conf dd33cb414bca17d97140d7f8671207f2
+ /etc/init/mountall-net.conf feff70cd7006f6763e24263d381940f3
+ /etc/init/mountall-shell.conf aa05af89db3de044d1cd7f6971b46d9f
+ /etc/init/mountall.sh.conf ee258840aad52477434cc22e34efcc50
+ /etc/init/bootmisc.sh.conf d1a51c54dcfe6f3f5265246888ba4161
+ /etc/init/mountnfs.sh.conf 760a5b57cbd0d1e2c65ba6db9297a586
+ /etc/init/mounted-proc.conf 07198659bd06c1442a35882b2fae05fc
+ /etc/init/mountnfs-bootclean.sh.conf 0b6f3f9e9f8757efee57f6a4839d7dff
+ /etc/init/mountall.conf ac0fbaa98e705e52f59ca9e4d39751ad
+ /etc/init/mountall-bootclean.sh.conf d1899239aa60ea903f43a3ac58c5c238
+ /etc/init/mtab.sh.conf 27aece82dbe70232d734d1dadfe87518
+ /etc/init/mountkernfs.sh.conf 2e7449097b6cf88cba915edc1c339ec4
+ /etc/init/mounted-var.conf 02f90856c91a46e9cbed1c35b92fec6c
+ /etc/init/mountall-reboot.conf 43e3c229085a13005b0681a49b2bef51
+ /etc/init/checkroot-bootclean.sh.conf e02a473c76e4a2bfc1efb4c367495052
+ /etc/init/checkfs.sh.conf 2e928476ccb2ecefe9ee87e2f83d34da
+ /etc/init/mounted-debugfs.conf 462c8aab0d9d4e6e496b1e2be5910edc
+ /etc/init/mounted-run.conf a26db58c801e0f6ec8738a5838aa53ed
+ /etc/dbus-1/system.d/Mountall.Server.conf 91b1414af1257d2ef089f84a3e5c1ed1
+Description: filesystem mounting tool
+ mountall mounts filesystems when the underlying block devices are
+ ready, or when network interfaces come up, checking the filesystems
+ first.
+Original-Maintainer: Steve Langasek <vorlon@debian.org>
+
+Package: kmod
+Status: install ok installed
+Priority: important
+Section: admin
+Installed-Size: 285
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 16-2ubuntu3
+Replaces: module-init-tools (<< 4)
+Depends: libc6 (>= 2.17), libkmod2, sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.16), lsb-base (>= 3.0-6)
+Breaks: module-init-tools (<< 4)
+Conffiles:
+ /etc/init/kmod.conf 2686532745c8b71d6d3df91c3a53aef3
+ /etc/modprobe.d/blacklist-framebuffer.conf 097e2142ae3e4dd2911eda7844ce0c18
+ /etc/modprobe.d/blacklist-rare-network.conf 8fb4b96124e461f53adceba9ca91f09a
+ /etc/modprobe.d/blacklist.conf bc6754fa320733c6d239a4bb0148ffd7
+ /etc/modprobe.d/iwlwifi.conf f27bc645e93e20c8e532325d190ac8ee
+ /etc/modprobe.d/blacklist-ath_pci.conf d1da9bb08c2b0f56f3be93fd0e37946b
+ /etc/modprobe.d/mlx4.conf b2a0bedb7461daeb0138270639581bbf
+ /etc/modprobe.d/blacklist-firewire.conf 9cc07a17e8e64f9cd35ff59c29debe69
+ /etc/modprobe.d/blacklist-watchdog.conf 55327f9270c8a6257a833c4d127a39e1
+ /etc/init.d/kmod e6d43abead3714ceb8aca68dd77e1dad
+ /etc/depmod.d/ubuntu.conf 7c8439ef36b12e5f226b5dbfa20b8c2d
+Description: tools for managing Linux kernel modules
+ This package contains a set of programs for loading, inserting, and
+ removing kernel modules for Linux.
+ It replaces module-init-tools.
+Original-Maintainer: Marco d'Itri <md@linux.it>
+
+Package: libkmod2
+Status: install ok installed
+Priority: important
+Section: libs
+Installed-Size: 138
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: kmod
+Version: 16-2ubuntu3
+Depends: libc6 (>= 2.17)
+Pre-Depends: multiarch-support
+Description: libkmod shared library
+ This library provides an API for insertion, removal, configuration and
+ listing of kernel modules.
+Original-Maintainer: Marco d'Itri <md@linux.it>
+
+Package: tar
+Essential: yes
+Status: install ok installed
+Priority: required
+Section: utils
+Installed-Size: 760
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 1.27.1-2
+Replaces: cpio (<< 2.4.2-39)
+Pre-Depends: libacl1 (>= 2.2.51-8), libc6 (>= 2.17), libselinux1 (>= 1.32)
+Suggests: bzip2, ncompress, xz-utils, tar-scripts
+Breaks: dpkg-dev (<< 1.14.26)
+Conflicts: cpio (<= 2.4.2-38)
+Conffiles:
+ /etc/rmt 3c58b7cd13da1085eff0acc6a00f43c7
+Description: GNU version of the tar archiving utility
+ Tar is a program for packaging a set of files as a single archive in tar
+ format.  The function it performs is conceptually similar to cpio, and to
+ things like PKZIP in the DOS world.  It is heavily used by the Debian package
+ management system, and is useful for performing system backups and exchanging
+ sets of files with others.
+Original-Maintainer: Bdale Garbee <bdale@gag.com>
+
+Package: libmount1
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 249
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: util-linux
+Version: 2.20.1-5.1ubuntu20
+Depends: libblkid1 (>= 2.17.2), libc6 (>= 2.8), libselinux1 (>= 1.32)
+Pre-Depends: multiarch-support
+Description: block device id library
+ The device mounting library, used by mount and mount helpers.
+Homepage: http://userweb.kernel.org/~kzak/util-linux/
+Original-Maintainer: LaMont Jones <lamont@debian.org>
+
+Package: zlib1g
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 170
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: zlib
+Version: 1:1.2.8.dfsg-1ubuntu1
+Provides: libz1
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Breaks: libxml2 (<< 2.7.6.dfsg-2), texlive-binaries (<< 2009-12)
+Conflicts: zlib1 (<= 1:1.0.4-7)
+Description: compression library - runtime
+ zlib is a library implementing the deflate compression method found
+ in gzip and PKZIP.  This package includes the shared library.
+Homepage: http://zlib.net/
+Original-Maintainer: Mark Brown <broonie@debian.org>
+
+Package: adduser
+Status: install ok installed
+Priority: important
+Section: admin
+Installed-Size: 644
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Version: 3.113+nmu3ubuntu3
+Replaces: manpages-it (<< 0.3.4-2), manpages-pl (<= 20051117-1)
+Depends: perl-base (>= 5.6.0), passwd (>= 1:4.0.12), debconf | debconf-2.0
+Suggests: liblocale-gettext-perl, perl-modules, ecryptfs-utils (>= 67-1)
+Conffiles:
+ /etc/deluser.conf 773fb95e98a27947de4a95abb3d3f2a2
+Description: add and remove users and groups
+ This package includes the 'adduser' and 'deluser' commands for creating
+ and removing users.
+ .
+  - 'adduser' creates new users and groups and adds existing users to
+    existing groups;
+  - 'deluser' removes users and groups and removes users from a given
+    group.
+ .
+ Adding users with 'adduser' is much easier than adding them manually.
+ Adduser will choose appropriate UID and GID values, create a home
+ directory, copy skeletal user configuration, and automate setting
+ initial values for the user's password, real name and so on.
+ .
+ Deluser can back up and remove users' home directories
+ and mail spool or all the files they own on the system.
+ .
+ A custom script can be executed after each of the commands.
+ .
+  Development mailing list:
+    http://lists.alioth.debian.org/mailman/listinfo/adduser-devel/
+Homepage: http://alioth.debian.org/projects/adduser/
+Original-Maintainer: Debian Adduser Developers <adduser-devel@lists.alioth.debian.org>
+
+Package: libgcc1
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 154
+Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: gcc-4.9 (4.9.0-1ubuntu3)
+Version: 1:4.9.0-1ubuntu3
+Depends: gcc-4.9-base (= 4.9.0-1ubuntu3), libc6 (>= 2.2.4)
+Pre-Depends: multiarch-support
+Breaks: gcc-4.3 (<< 4.3.6-1), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2)
+Description: GCC support library
+ Shared version of the support library, a library of internal subroutines
+ that GCC uses to overcome shortcomings of particular machines, or
+ special needs for some languages.
+Homepage: http://gcc.gnu.org/
+Original-Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
+
+Package: libdebconfclient0
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 85
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: cdebconf
+Version: 0.190ubuntu1
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Description: Debian Configuration Management System (C-implementation library)
+ Debconf is a configuration management system for Debian packages. It is
+ used by some packages to prompt you for information before they are
+ installed. This is a reimplementation of the original debconf version
+ in C.
+ .
+ This is the libraries needed by libdebconfclient-dev and cdebconf.
+Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
+
+Package: libklibc
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 133
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Source: klibc
+Version: 2.0.3-0ubuntu1
+Description: minimal libc subset for use with initramfs
+ klibc is intended to be a minimalistic libc subset for use with
+ initramfs.  It is deliberately written for small size, minimal
+ entanglement, and portability, not speed.  It is definitely a work in
+ progress, and a lot of things are still missing.
+Homepage: http://git.kernel.org/?p=libs/klibc/klibc.git;a=summary
+Original-Maintainer: maximilian attems <maks@debian.org>
+
+Package: libcgmanager0
+Status: install ok installed
+Priority: optional
+Section: admin
+Installed-Size: 152
+Maintainer: Serge Hallyn <serge.hallyn@ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: cgmanager
+Version: 0.25-0ubuntu4
+Depends: libc6 (>= 2.1.3), libdbus-1-3 (>= 1.0.2)
+Description: Central cgroup manager daemon (client library)
+ cgmanager provides a central cgroup manager daemon and a
+ per-namespace manager proxy, allowing users and programs
+ to administrate cgroups through D-Bus requests.
+ .
+ This package contains the shared library.
+Homepage: http://cgmanager.linuxcontainers.org/
+
+Package: mount
+Essential: yes
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 410
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Source: util-linux
+Version: 2.20.1-5.1ubuntu20
+Pre-Depends: libblkid1 (>= 2.20.1), libc6 (>= 2.8), libmount1 (>= 2.20.1), libselinux1 (>= 2.0.15)
+Suggests: nfs-common (>= 1:1.1.0-13)
+Description: Tools for mounting and manipulating filesystems
+ This package provides the mount(8), umount(8), swapon(8),
+ swapoff(8), and losetup(8) commands.
+Homepage: http://userweb.kernel.org/~kzak/util-linux/
+Original-Maintainer: LaMont Jones <lamont@debian.org>
+
+Package: libncurses5
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 292
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: ncurses
+Version: 5.9+20140118-1ubuntu1
+Depends: libtinfo5 (= 5.9+20140118-1ubuntu1), libc6 (>= 2.15)
+Pre-Depends: multiarch-support, libtinfo5 (>= 5.9-3)
+Recommends: libgpm2
+Description: shared libraries for terminal handling
+ The ncurses library routines are a terminal-independent method of
+ updating character screens with reasonable optimization.
+ .
+ This package contains the shared libraries necessary to run programs
+ compiled with ncurses.
+Homepage: http://invisible-island.net/ncurses/
+Original-Maintainer: Craig Small <csmall@debian.org>
+
+Package: libplymouth2
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 298
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: plymouth
+Version: 0.8.8-0ubuntu17
+Replaces: plymouth (<< 0.7.0+git20090207-0ubuntu0.1~ppa4)
+Depends: libc6 (>= 2.8), libpng12-0 (>= 1.2.13-4)
+Pre-Depends: multiarch-support
+Breaks: casper (= 1.227), mountall (<< 2.8)
+Description: graphical boot animation and logger - shared libraries
+ Plymouth is an application that runs very early in the boot process
+ (even before the root filesystem is mounted!) that provides a graphical
+ boot animation while the boot process happens in the background.
+ .
+ This package contains the shared libraries.
+
+Package: gcc-4.9-base
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 213
+Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: gcc-4.9
+Version: 4.9.0-1ubuntu3
+Breaks: dehydra (<= 0.9.hg20110609-2), gcc-4.4-base (<< 4.4.7), gcj-4.4-base (<< 4.4.6-9~), gcj-4.6-base (<< 4.6.1-4~), gnat-4.4-base (<< 4.4.6-3~), gnat-4.6 (<< 4.6.1-5~)
+Description: GCC, the GNU Compiler Collection (base package)
+ This package contains files common to all languages and libraries
+ contained in the GNU Compiler Collection (GCC).
+Homepage: http://gcc.gnu.org/
+Original-Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
+
+Package: initramfs-tools-bin
+Status: install ok installed
+Priority: optional
+Section: utils
+Installed-Size: 119
+Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
+Architecture: i386
+Source: initramfs-tools
+Version: 0.103ubuntu4
+Depends: libc6 (>= 2.4), libudev1 (>= 183)
+Description: binaries used by initramfs-tools
+ This package contains binaries used inside the initramfs images generated
+ by initramfs-tools.
+Original-Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
+
+Package: libattr1
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 55
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: attr
+Version: 1:2.4.47-1ubuntu1
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Conflicts: attr (<< 2.0.0)
+Description: Extended attribute shared library
+ Contains the runtime environment required by programs that make use
+ of extended attributes.
+Homepage: http://savannah.nongnu.org/projects/attr/
+Original-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+
+Package: klibc-utils
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 392
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Source: klibc
+Version: 2.0.3-0ubuntu1
+Depends: libklibc (= 2.0.3-0ubuntu1)
+Breaks: initramfs-tools (<< 0.103)
+Description: small utilities built with klibc for early boot
+ This package contains a collection of programs that are linked
+ against klibc. These duplicate some of the functionality of a
+ regular Linux toolset, but are typically much smaller than their
+ full-function counterparts.  They are intended for inclusion in
+ initramfs images and embedded systems.
+Homepage: http://git.kernel.org/?p=libs/klibc/klibc.git;a=summary
+Original-Maintainer: maximilian attems <maks@debian.org>
+
+Package: e2fslibs
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 418
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: e2fsprogs
+Version: 1.42.9-3ubuntu1
+Replaces: e2fsprogs (<< 1.34-1)
+Provides: libe2p2, libext2fs2
+Depends: libc6 (>= 2.17)
+Pre-Depends: multiarch-support
+Description: ext2/ext3/ext4 file system libraries
+ The ext2, ext3 and ext4 file systems are successors of the original ext
+ ("extended") file system. They are the main file system types used for
+ hard disks on Debian and other Linux systems.
+ .
+ This package provides the ext2fs and e2p libraries, for userspace software
+ that directly accesses extended file systems. Programs that use libext2fs
+ include e2fsck, mke2fs, and tune2fs. Programs that use libe2p include
+ dumpe2fs, chattr, and lsattr.
+Homepage: http://e2fsprogs.sourceforge.net
+Original-Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
+
+Package: base-passwd
+Essential: yes
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 247
+Maintainer: Colin Watson <cjwatson@debian.org>
+Architecture: i386
+Multi-Arch: foreign
+Version: 3.5.33
+Replaces: base
+Depends: libc6 (>= 2.8), libdebconfclient0 (>= 0.145)
+Recommends: debconf (>= 0.5) | debconf-2.0
+Description: Debian base system master password and group files
+ These are the canonical master copies of the user database files
+ (/etc/passwd and /etc/group), containing the Debian-allocated user and
+ group IDs. The update-passwd tool is provided to keep the system databases
+ synchronized with these master files.
+
+Package: libcomerr2
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 102
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: e2fsprogs
+Version: 1.42.9-3ubuntu1
+Replaces: e2fsprogs (<< 1.34-1)
+Provides: libcomerr-kth-compat
+Depends: libc6 (>= 2.17)
+Pre-Depends: multiarch-support
+Description: common error description library
+ libcomerr is an attempt to present a common error-handling mechanism to
+ manipulate the most common form of error code in a fashion that does not
+ have the problems identified with mechanisms commonly in use.
+Homepage: http://e2fsprogs.sourceforge.net
+Original-Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
+
+Package: plymouth
+Status: install ok installed
+Priority: optional
+Section: x11
+Installed-Size: 441
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Version: 0.8.8-0ubuntu17
+Depends: initramfs-tools, libplymouth2 (= 0.8.8-0ubuntu17), mountall (>= 2.0), upstart (>= 1.11-0ubuntu3), udev (>= 166-0ubuntu4), sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.16), libc6 (>= 2.8), libdbus-1-3 (>= 1.1.1), libdrm2 (>= 2.4.25), libtinfo5
+Recommends: plymouth-theme-ubuntu-text | plymouth-theme
+Breaks: gdm (<< 3.0.4-0ubuntu11), kdm (<< 4:4.7.1-0ubuntu3), lightdm (<< 0.9.7-0ubuntu2), lubuntu-plymouth-theme (<= 0.4), lxdm (<< 0.4.1-0ubuntu2), ubuntustudio-plymouth-theme (<= 0.38), xubuntu-plymouth-theme (<< 10.04.4)
+Conflicts: usplash
+Conffiles:
+ /etc/init/plymouth-ready.conf f8542ccc586a5b63f5b76f68ac4f2f59
+ /etc/init/plymouth-shutdown.conf febc1a3763f8e15add963ede4e561a26
+ /etc/init/plymouth-stop.conf 03c8ba8289470d71e22fdbfa5859e122
+ /etc/init/plymouth.conf 859e01281230eb9a522c99875f4b8b69
+ /etc/init/plymouth-log.conf 65d2943a69f455dec3fed43fd7996d76
+ /etc/init/plymouth-splash.conf 63b63b446cc981dc4f2fa5772b4b3e93
+ /etc/init/plymouth-upstart-bridge.conf dd271be2c476aadd0cd34bc77d95a379
+Description: graphical boot animation and logger - main package
+ Plymouth is an application that runs very early in the boot process
+ (even before the root filesystem is mounted!) that provides a graphical
+ boot animation while the boot process happens in the background.
+
+Package: upstart
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 1621
+Maintainer: James Hunt <james.hunt@ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 1.12.1-0ubuntu4
+Replaces: startup-tasks, system-services, sysvinit, upstart-compat-sysv, upstart-job
+Provides: startup-tasks, system-services, upstart-compat-sysv, upstart-job
+Depends: libc6 (>= 2.15), libdbus-1-3 (>= 1.2.16), libjson-c2 (>= 0.10), libnih-dbus1 (>= 1.0.0), libnih1 (>= 1.0.0), libselinux1 (>= 1.32), libudev1 (>= 183), sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
+Suggests: python3, graphviz, bash-completion, upstart-monitor
+Breaks: friendly-recovery (<< 0.2.13), libc6 (<< 2.12.1-0ubuntu12)
+Conflicts: lxcguest, startup-tasks, system-services, sysvinit, upstart-compat-sysv, upstart-job
+Conffiles:
+ /etc/logrotate.d/upstart 070767086a27883ec119e1dde779a856
+ /etc/cron.daily/upstart 761747ebd3d1677620d5af50c9900b13
+ /etc/dbus-1/system.d/Upstart.conf 64be74cddb0c74b7d98202b40389784c
+ /etc/bash_completion.d/upstart 080f7eee4a3f3e5f76197eaa581fb4da
+ /etc/X11/Xsession.d/99upstart d150fce36cf22f5504e4dbc89b4826e0
+ /etc/X11/Xsession.d/00upstart 46b4576b1f2ceffb2450a88d58786b95
+ /etc/init/tty5.conf 6d5794f72a1098b008e53e326a6bb5a0
+ /etc/init/rc-sysinit.conf a50c045d9390a6e6c43c18b19cd72fe5
+ /etc/init/rcS.conf 8533688686f75d7bcf20da5a0d36d94b
+ /etc/init/flush-early-job-log.conf 09e959647877c39f6490ad29b8a35a28
+ /etc/init/wait-for-state.conf 20b85b55c3f1e040fdbbf669afe4d2a1
+ /etc/init/shutdown.conf 559659602cefe7e8d3c1e76820f5ae5d
+ /etc/init/upstart-udev-bridge.conf 2c24bb70877476b5e7016ccf6de745a4
+ /etc/init/tty2.conf 0d9326fdda081ac96d92bbc57ff773e4
+ /etc/init/failsafe.conf 0b88eeccf6c8fd456e886aa7a76e3291
+ /etc/init/rc.conf 3ebc6ddcd00482cfb24ce09a14ded29f
+ /etc/init/upstart-file-bridge.conf 57ea7ed6cba1f1259ac87410c59237ca
+ /etc/init/console.conf 8d79b0205f2daffb473604ce53e1dc83
+ /etc/init/tty1.conf f42f2298f711147ecf177054294861a7
+ /etc/init/control-alt-delete.conf 16e6603524084b63b0f0ca04eb56757e
+ /etc/init/upstart-socket-bridge.conf 5f3eaca09ee1f03d5d0686ea99f8c051
+ /etc/init/tty4.conf 2c78cd865d848bb2674104905151dbe2
+ /etc/init/tty3.conf 6608f08adf00a282358a1eeb9bdcf78e
+ /etc/init/tty6.conf e8ad2f0411614f9c8dc9c4e364763549
+ /etc/init/container-detect.conf 6bae6257355ad7322e7263e567817465
+ /etc/upstart-xsessions ec9aa92a5c50938479d711daa9ee774a
+Description: event-based init daemon
+ upstart is a replacement for the /sbin/init daemon which handles
+ starting of tasks and services during boot, stopping them during
+ shutdown and supervising them while the system is running.
+Homepage: http://upstart.ubuntu.com/
+Orig-Maintainer: Steve Langasek <vorlon@debian.org>
+
+Package: passwd
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 2250
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Source: shadow
+Version: 1:4.1.5.1-1ubuntu9
+Replaces: manpages-tr (<< 1.0.5), manpages-zh (<< 1.5.1-1)
+Depends: libc6 (>= 2.8), libpam0g (>= 0.99.7.1), libselinux1 (>= 1.32), libsemanage1 (>= 2.0.3), libpam-modules, debianutils (>= 2.15.2)
+Conffiles:
+ /etc/default/useradd cc9f9a7713ab62a32cd38363d958f396
+ /etc/init/passwd.conf ea81baf06e4c358225ce22b786ad9e6a
+ /etc/cron.daily/passwd db990990933b6f56322725223f13c2bc
+ /etc/pam.d/chpasswd 9900720564cb4ee98b7da29e2d183cb2
+ /etc/pam.d/newusers 1454e29bfa9f2a10836563e76936cea5
+ /etc/pam.d/chfn 4d466e00a348ba426130664d795e8afa
+ /etc/pam.d/passwd eaf2ad85b5ccd06cceb19a3e75f40c63
+ /etc/pam.d/chsh a6e9b589e90009334ffd030d819290a6
+Description: change and administer password and group data
+ This package includes passwd, chsh, chfn, and many other programs to
+ maintain password and group data.
+ .
+ Shadow passwords are supported.  See /usr/share/doc/passwd/README.Debian
+Homepage: http://pkg-shadow.alioth.debian.org/
+Original-Maintainer: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
+
+Package: libacl1
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 75
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: acl
+Version: 2.2.52-1
+Depends: libattr1 (>= 1:2.4.46-8), libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Conflicts: acl (<< 2.0.0), libacl1-kerberos4kth
+Description: Access control list shared library
+ This package contains the libacl.so dynamic library containing
+ the POSIX 1003.1e draft standard 17 functions for manipulating
+ access control lists.
+Original-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+Homepage: http://savannah.nongnu.org/projects/acl/
+
+Package: libslang2
+Status: install ok installed
+Priority: important
+Section: libs
+Installed-Size: 1244
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: slang2
+Version: 2.2.4-16ubuntu1
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Recommends: libpng12-0
+Description: S-Lang programming library - runtime version
+ S-Lang is a C programmer's library that includes routines for the rapid
+ development of sophisticated, user friendly, multi-platform applications.
+ .
+ This package contains only the shared library libslang.so.* and copyright
+ information. It is only necessary for programs that use this library (such
+ as jed and slrn). If you plan on doing development with S-Lang, you will
+ need the companion -dev package as well.
+Homepage: http://www.jedsoft.org/slang/
+Original-Maintainer: Alastair McKinstry <mckinstry@debian.org>
+
+Package: initscripts
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 219
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Source: sysvinit
+Version: 2.88dsf-41ubuntu6
+Replaces: libc0.1, libc0.3, libc6, libc6.1
+Depends: libc6 (>= 2.4), mount (>= 2.11x-1), debianutils (>= 4), lsb-base (>= 3.2-14), sysvinit-utils (>= 2.86.ds1-64), sysv-rc | file-rc, coreutils (>= 5.93), passwd, upstart, mountall (>= 2.28)
+Recommends: psmisc, e2fsprogs
+Breaks: aide (<< 0.15.1-5), atm-tools (<< 1:2.5.1-1.3), bootchart (<< 0.10~svn407-3.3), console-common (<< 0.7.86), cruft (<< 0.9.16), eepc-acpi-scripts (<< 1.1.12), fcheck (<< 2.7.59-16), hostapd (<< 1:0.7.3-3), hostname (<< 2.95ubuntu1~boot2), ifupdown (<< 0.6.8ubuntu27), libpam-mount (<< 2.13-1), ltsp-client-core (<< 5.2.16-1), mdadm (<< 3.2.2-1), nbd-client (<< 1:2.9.23-1), nfs-common (<< 1:1.2.5-3), portmap (<< 6.0.0-2), readahead-fedora (<< 2:1.5.6-3), resolvconf (<< 1.49), rpcbind (<< 0.2.0-7), rsyslog (<< 5.8.2-2), selinux-policy-default (<= 2:0.2.20100524-9), splashy (<< 0.3.13-5.1+b1), sysklogd (<< 1.5-6.2), udev (<< 146-2~boot6), upstart (<< 0.6.3-2~boot4), wpasupplicant (<< 0.7.3-4), xymon (<< 4.3.0~beta2.dfsg-9)
+Conflicts: libdevmapper1.02.1 (<< 2:1.02.24-1)
+Conffiles:
+ /etc/init.d/halt 6ae1b3b1b8198567a5e32116077f12a2
+ /etc/init.d/killprocs 5e404d35091fab6c4889302736ed4602
+ /etc/init.d/ondemand 63d57b1f5df759ddea8ef193094c118a
+ /etc/init.d/rc.local 18cd07959adfa8411ca17fe7c2ec3d96
+ /etc/init.d/reboot 1b9db1ef7bfd79b128ef85d5065721a6
+ /etc/init.d/sendsigs 8376da0c226dcc989f6829230b1d5b50
+ /etc/init.d/single dc13cb373c5c098a8fb95424701373e3
+ /etc/init.d/umountfs 07e4c8c8d9136f36745feb4776edc6f4
+ /etc/init.d/umountnfs.sh b369d5215733f79ee2bf58cc966c5931
+ /etc/init.d/umountroot 677b1eb8358469b50044663bfbee5699
+ /etc/init.d/urandom e6454386bfce38efb5987dd06cb3b21d
+ /etc/default/devpts fc857c5ac5fb84d80720ed4d1c624f6e
+ /etc/default/halt 18d9844cf8ca8608e2a559a4555e593a
+ /etc/default/rcS db3696fc6caa33a1d72b33fa3cec7c42
+Description: scripts for initializing and shutting down the system
+ The scripts in this package initialize a standard Debian
+ system at boot time and shut it down at halt or reboot time.
+Homepage: http://savannah.nongnu.org/projects/sysvinit
+Original-Maintainer: Debian sysvinit maintainers <pkg-sysvinit-devel@lists.alioth.debian.org>
+
+Package: libblkid1
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 254
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: util-linux
+Version: 2.20.1-5.1ubuntu20
+Depends: libc6 (>= 2.7), libuuid1 (>= 2.16)
+Pre-Depends: multiarch-support
+Conffiles:
+ /etc/blkid.conf 7f4c49e01e0a23d2f4b20eeb32e95abb
+Description: block device id library
+ The blkid library which allows system programs like fsck and
+ mount to quickly and easily find block devices by filesystem UUID and
+ LABEL.  This allows system administrators to avoid specifying
+ filesystems by hard-coded device names, but via a logical naming
+ system instead.
+Homepage: http://userweb.kernel.org/~kzak/util-linux/
+Original-Maintainer: LaMont Jones <lamont@debian.org>
+
+Package: libss2
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 110
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: e2fsprogs
+Version: 1.42.9-3ubuntu1
+Replaces: e2fsprogs (<< 1.34-1)
+Depends: libcomerr2, libc6 (>= 2.17)
+Pre-Depends: multiarch-support
+Description: command-line interface parsing library
+ libss provides a simple command-line interface parser which will
+ accept input from the user, parse the command into an argv argument
+ vector, and then dispatch it to a handler function.
+ .
+ It was originally inspired by the Multics SubSystem library.
+Homepage: http://e2fsprogs.sourceforge.net
+Original-Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
+
+Package: libsemanage-common
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 56
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Source: libsemanage
+Version: 2.2-1ubuntu1
+Replaces: libsemanage1 (<= 2.0.41-1), libsemanage1-dev (<< 2.1.6-3~)
+Breaks: libsemanage1 (<= 2.0.41-1), libsemanage1-dev (<< 2.1.6-3~)
+Conffiles:
+ /etc/selinux/semanage.conf e69d42a4d98a93c3b8e201bdda367c55
+Description: Common files for SELinux policy management libraries
+ This package provides the common files used by the shared libraries
+ for SELinux policy management.
+ .
+ Security-enhanced Linux is a patch of the Linux kernel and a
+ number of utilities with enhanced security functionality designed to
+ add mandatory access controls to Linux.  The Security-enhanced Linux
+ kernel contains new architectural components originally developed to
+ improve the security of the Flask operating system. These
+ architectural components provide general support for the enforcement
+ of many kinds of mandatory access control policies, including those
+ based on the concepts of Type Enforcement, Role-based Access
+ Control, and Multi-level Security.
+Original-Maintainer: Debian SELinux maintainers <selinux-devel@lists.alioth.debian.org>
+Homepage: http://userspace.selinuxproject.org/
+
+Package: libpam-modules-bin
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 212
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Source: pam
+Version: 1.1.8-1ubuntu2
+Replaces: libpam-modules (<< 1.1.3-8)
+Depends: libaudit1 (>= 1:2.2.1), libc6 (>= 2.4), libpam0g (>= 0.99.7.1), libselinux1 (>= 1.32)
+Description: Pluggable Authentication Modules for PAM - helper binaries
+ This package contains helper binaries used by the standard set of PAM
+ modules in the libpam-modules package.
+Homepage: http://pam.sourceforge.net/
+Original-Maintainer: Steve Langasek <vorlon@debian.org>
+
+Package: findutils
+Essential: yes
+Status: install ok installed
+Priority: required
+Section: utils
+Installed-Size: 668
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 4.4.2-8
+Pre-Depends: libc6 (>= 2.17)
+Suggests: mlocate | locate
+Description: utilities for finding files--find, xargs
+ GNU findutils provides utilities to find files meeting specified
+ criteria and perform various actions on the files which are found.
+ This package contains 'find' and 'xargs'; however, 'locate' has
+ been split off into a separate package.
+Original-Maintainer: Andreas Metzler <ametzler@debian.org>
+Homepage: http://savannah.gnu.org/projects/findutils/
+
+Package: e2fsprogs
+Essential: yes
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 2424
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 1.42.9-3ubuntu1
+Replaces: hurd (<= 20040301-1), libblkid1 (<< 1.38+1.39-WIP-2005.12.10-2), libuuid1 (<< 1.38+1.39-WIP-2005.12.10-2)
+Pre-Depends: e2fslibs (= 1.42.9-3ubuntu1), libblkid1 (>= 2.17.2), libc6 (>= 2.11), libcomerr2 (>= 1.42~WIP-2011-10-05-1), libss2 (>= 1.34-1), libuuid1 (>= 2.16), util-linux (>= 2.15~rc1-1)
+Suggests: gpart, parted, e2fsck-static
+Conflicts: dump (<< 0.4b4-4), initscripts (<< 2.85-4), quota (<< 1.55-8.1), sysvinit (<< 2.85-4)
+Conffiles:
+ /etc/mke2fs.conf e2cdbf0620e93949af5857eb4739f949
+Description: ext2/ext3/ext4 file system utilities
+ The ext2, ext3 and ext4 file systems are successors of the original ext
+ ("extended") file system. They are the main file system types used for
+ hard disks on Debian and other Linux systems.
+ .
+ This package contains programs for creating, checking, and maintaining
+ ext2/3/4-based file systems.  It also includes the "badbocks" program,
+ which can be used to scan for bad blocks on a disk or other storage device.
+Homepage: http://e2fsprogs.sourceforge.net
+Original-Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
+
+Package: liblzma5
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 316
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: xz-utils
+Version: 5.1.1alpha+20120614-2ubuntu2
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Description: XZ-format compression library
+ XZ is the successor to the Lempel-Ziv/Markov-chain Algorithm
+ compression format, which provides memory-hungry but powerful
+ compression (often better than bzip2) and fast, easy decompression.
+ .
+ The native format of liblzma is XZ; it also supports raw (headerless)
+ streams and the older LZMA format used by lzma. (For 7-Zip's related
+ format, use the p7zip package instead.)
+Homepage: http://tukaani.org/xz/
+Original-Maintainer: Jonathan Nieder <jrnieder@gmail.com>
+
+Package: libnih1
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 147
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: libnih
+Version: 1.0.3-4ubuntu25
+Pre-Depends: multiarch-support, libc6 (>= 2.15~)
+Description: NIH Utility Library
+ libnih is a light-weight "standard library" of C functions to ease the
+ development of other libraries and applications, especially those
+ normally found in /lib.
+ .
+ This package contains the shared library.
+Homepage: https://launchpad.net/libnih
+Original-Maintainer: Scott James Remnant <scott@netsplit.com>
+
+Package: libaudit1
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 143
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: audit
+Version: 1:2.3.2-2ubuntu1
+Depends: libaudit-common (= 1:2.3.2-2ubuntu1), libc6 (>= 2.8)
+Pre-Depends: multiarch-support
+Description: Dynamic library for security auditing
+ The audit-libs package contains the dynamic libraries needed for
+ applications to use the audit framework. It is used to monitor systems for
+ security related events.
+Homepage: http://people.redhat.com/sgrubb/audit/
+Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+
+Package: libdb5.3
+Status: install ok installed
+Priority: standard
+Section: libs
+Installed-Size: 1788
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: db5.3
+Version: 5.3.28-3ubuntu3
+Depends: libc6 (>= 2.17)
+Pre-Depends: multiarch-support
+Description: Berkeley v5.3 Database Libraries [runtime]
+ This is the runtime package for programs that use the v5.3 Berkeley
+ database library.
+Homepage: http://www.oracle.com/technology/software/products/berkeley-db/index.html
+Original-Maintainer: Debian Berkeley DB Group <pkg-db-devel@lists.alioth.debian.org>
+
+Package: insserv
+Status: install ok installed
+Priority: optional
+Section: misc
+Installed-Size: 182
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Version: 1.14.0-5ubuntu2
+Depends: libc6 (>= 2.7)
+Suggests: bootchart2
+Breaks: sysv-rc (<< 2.87dsf-3)
+Conffiles:
+ /etc/insserv.conf 3e9467113029a6356f57842085f3c849
+ /etc/bash_completion.d/insserv 32975fe14795d6fce1408d5fd22747fd
+Description: boot sequence organizer using LSB init.d script dependency information
+ The insserv program is used by the standard SysV-based init system. It
+ updates the order of symlinks in /etc/rc?.d/ based on dependencies
+ specified by LSB headers in the init.d scripts themselves.
+ .
+ These declared relations between scripts make it possible to optimize
+ the boot sequence for the currently installed set of packages, while
+ detecting and rejecting dependency loops.
+ .
+ Using insserv incorrectly can result in an unbootable system.
+Homepage: http://savannah.nongnu.org/projects/sysvinit
+Original-Maintainer: Petter Reinholdtsen <pere@debian.org>
+
+Package: dpkg
+Essential: yes
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 6327
+Origin: debian
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Bugs: debbugs://bugs.debian.org
+Architecture: i386
+Multi-Arch: foreign
+Version: 1.17.9ubuntu1
+Replaces: manpages-it (<< 2.80-4)
+Pre-Depends: libbz2-1.0, libc6 (>= 2.11), liblzma5 (>= 5.1.1alpha+20120614), libselinux1 (>= 2.1.0), zlib1g (>= 1:1.1.4), tar (>= 1.23)
+Suggests: apt
+Breaks: apt (<< 0.7.7), aptitude (<< 0.4.7-1), dpkg-dev (<< 1.15.8), libdpkg-perl (<< 1.15.8)
+Conflicts: ada-reference-manual (<< 20021112web-4), asn1-mode (<< 2.7-7), bogosort (<< 0.4.2-3), cl-yacc (<< 0.3-3), cpp-4.1-doc (<< 4.1.2.nf2-4), cpp-4.2-doc (<< 4.2.4.nf1-4), gcc-4.1-doc (<< 4.1.2.nf2-4), gcc-4.2-doc (<< 4.2.4.nf1-4), gcj-4.1-doc (<< 4.1.2.nf2-4), gcj-4.2-doc (<< 4.2.4.nf1-4), gfortran-4.1-doc (<< 4.1.2.nf2-4), gfortran-4.2-doc (<< 4.2.4.nf1-4), ggz-docs (<< 0.0.14.1-2), glame (<< 2.0.1-6), gnat-4.1-doc (<< 4.1.2.nf2-4), gnat-4.2-doc (<< 4.2.4.nf1-4), gtalk (<< 0.99.10-16), libalogg-dev (<< 1.3.7-2), libgtk1.2-doc (<< 1.2.10-19), libnettle-dev (<< 2), liborbit-dev (<< 0.5.17-12), libreadline5-dev (<< 5.2-8), librep-doc (<< 0.90), mmucl (<< 1.5.2-3), nxml-mode (<< 20041004-9), r6rs-doc (<< 1.0-2), serveez-doc (<< 0.1.5-3), slat (<< 2.0-6), texlive-base-bin-doc (<< 2007.dfsg.2-9), ttcn-el (<< 0.6.9-2), ulog-acctd (<< 0.4.3-3), xconq-doc (<< 7.4.1-5), zenirc (<< 2.112.dfsg-1)
+Conffiles:
+ /etc/alternatives/README 69c4ba7f08363e998e0f2e244a04f881
+ /etc/logrotate.d/dpkg 782ea5ae536f67ff51dc8c3e2eeb4cf9
+ /etc/dpkg/dpkg.cfg f4413ffb515f8f753624ae3bb365b81b
+ /etc/cron.daily/dpkg 2712ab0dc801324ea632a0f1f82cd38c
+Description: Debian package management system
+ This package provides the low-level infrastructure for handling the
+ installation and removal of Debian software packages.
+ .
+ For Debian package development tools, install dpkg-dev.
+Homepage: https://wiki.debian.org/Teams/Dpkg
+Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
+
+Package: libpcre3
+Status: install ok installed
+Priority: important
+Section: libs
+Installed-Size: 595
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: pcre3
+Version: 1:8.31-5ubuntu1
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Breaks: approx (<< 4.4-1~), cduce (<< 0.5.3-2~), cmigrep (<< 1.5-7~), galax (<< 1.1-7~), libpcre-ocaml (<< 6.0.1~), liquidsoap (<< 0.9.2-3~), ocsigen (<< 1.3.3-1~)
+Conflicts: libpcre3-dev (<= 4.3-3)
+Description: Perl 5 Compatible Regular Expression Library - runtime files
+ This is a library of functions to support regular expressions whose syntax
+ and semantics are as close as possible to those of the Perl 5 language.
+ .
+ This package contains the runtime libraries.
+Original-Maintainer: Mark Baker <mark@mnb.org.uk>
+
+Package: libncursesw5
+Status: install ok installed
+Priority: important
+Section: libs
+Installed-Size: 378
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: ncurses
+Version: 5.9+20140118-1ubuntu1
+Depends: libtinfo5 (= 5.9+20140118-1ubuntu1), libc6 (>= 2.15)
+Pre-Depends: multiarch-support
+Recommends: libgpm2
+Description: shared libraries for terminal handling (wide character support)
+ The ncurses library routines are a terminal-independent method of
+ updating character screens with reasonable optimization.
+ .
+ This package contains the shared libraries necessary to run programs
+ compiled with ncursesw, which includes support for wide characters.
+Homepage: http://invisible-island.net/ncurses/
+Original-Maintainer: Craig Small <csmall@debian.org>
+
+Package: busybox-initramfs
+Status: install ok installed
+Priority: optional
+Section: shells
+Installed-Size: 357
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Source: busybox
+Version: 1:1.22.0-5ubuntu1
+Depends: libc6 (>= 2.11)
+Description: Standalone shell setup for initramfs
+ BusyBox combines tiny versions of many common UNIX utilities into a single
+ small executable. It provides minimalist replacements for the most common
+ utilities you would usually find on your desktop system (i.e., ls, cp, mv,
+ mount, tar, etc.). The utilities in BusyBox generally have fewer options than
+ their full-featured GNU cousins; however, the options that are included
+ provide the expected functionality and behave very much like their GNU
+ counterparts.
+ .
+ busybox-initramfs provides a simple stand alone shell that provides
+ only the basic utilities needed for the initramfs.
+Homepage: http://www.busybox.net
+Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
+
+Package: libbz2-1.0
+Status: install ok installed
+Priority: important
+Section: libs
+Installed-Size: 116
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: bzip2
+Version: 1.0.6-5
+Depends: libc6 (>= 2.4)
+Pre-Depends: multiarch-support
+Description: high-quality block-sorting file compressor library - runtime
+ This package contains libbzip2 which is used by the bzip2 compressor.
+ .
+ bzip2 is a freely available, patent free, high-quality data compressor.
+ It typically compresses files to within 10% to 15% of the best available
+ techniques, whilst being around twice as fast at compression and six
+ times faster at decompression.
+ .
+ bzip2 compresses files using the Burrows-Wheeler block-sorting text
+ compression algorithm, and Huffman coding. Compression is generally
+ considerably better than that achieved by more conventional
+ LZ77/LZ78-based compressors, and approaches the performance of the PPM
+ family of statistical compressors.
+ .
+ The archive file format of bzip2 (.bz2) is incompatible with that of its
+ predecessor, bzip (.bz).
+Original-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+Homepage: http://www.bzip.org/
+
+Package: libtinfo5
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 433
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: ncurses
+Version: 5.9+20140118-1ubuntu1
+Replaces: libncurses5 (<< 5.9-3)
+Depends: libc6 (>= 2.15)
+Pre-Depends: multiarch-support
+Breaks: dialog (<< 1.2-20130523)
+Description: shared low-level terminfo library for terminal handling
+ The ncurses library routines are a terminal-independent method of
+ updating character screens with reasonable optimization.
+ .
+ This package contains the shared low-level terminfo library.
+Homepage: http://invisible-island.net/ncurses/
+Original-Maintainer: Craig Small <csmall@debian.org>
+
+Package: sysvinit-utils
+Status: install ok installed
+Priority: required
+Section: admin
+Installed-Size: 232
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Source: sysvinit
+Version: 2.88dsf-41ubuntu6
+Replaces: last, sysvinit (<= 2.86.ds1-65)
+Depends: libc6 (>= 2.15), libselinux1 (>= 1.32), sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.16)
+Recommends: upstart (>= 0.6.3-4)
+Suggests: bootlogd, sash
+Breaks: upstart (<< 1.5-0ubuntu5)
+Conflicts: chkconfig (<< 11.0-79.1-2), last, sysvconfig
+Conffiles:
+ /etc/init/startpar-bridge.conf d220afa75514468471c42469967341d2
+Description: System-V-like utilities
+ This package contains the important System-V-like utilities.
+ .
+ Specifically, this package includes:
+ killall5, last, lastb, mesg, pidof, service, sulogin
+Homepage: http://savannah.nongnu.org/projects/sysvinit
+Original-Maintainer: Debian sysvinit maintainers <pkg-sysvinit-devel@lists.alioth.debian.org>
+
+Package: multiarch-support
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 201
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Source: eglibc
+Version: 2.19-0ubuntu6
+Depends: libc6 (>= 2.13-5)
+Description: Transitional package to ensure multiarch compatibility
+ This is a transitional package used to ensure multiarch support is present
+ in ld.so before unpacking libraries to the multiarch directories.  It can
+ be removed once nothing on the system depends on it.
+Homepage: http://www.eglibc.org
+Original-Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
+
+Package: libjson0
+Status: install ok installed
+Priority: extra
+Section: oldlibs
+Installed-Size: 29
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: json-c
+Version: 0.11-4ubuntu1
+Depends: libjson-c2
+Description: JSON manipulation library (transitional package)
+ This is a transition package that can be safely removed once no
+ package depend on it.
+Homepage: https://github.com/json-c/json-c/wiki
+Original-Maintainer: fabien boucher <fabien.dot.boucher@gmail.com>
+
+Package: libnih-dbus1
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 65
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: libnih
+Version: 1.0.3-4ubuntu25
+Depends: libnih1 (= 1.0.3-4ubuntu25), libc6 (>= 2.3.4), libdbus-1-3 (>= 1.2.16)
+Pre-Depends: multiarch-support
+Description: NIH D-Bus Bindings Library
+ libnih-dbus is a D-Bus bindings library that integrates with the main
+ loop provided by libnih.
+ .
+ This package contains the shared library.
+Homepage: https://launchpad.net/libnih
+Original-Maintainer: Scott James Remnant <scott@netsplit.com>
+
+Package: libselinux1
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 192
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: libselinux
+Version: 2.2.2-1ubuntu1
+Depends: libc6 (>= 2.8), libpcre3
+Pre-Depends: multiarch-support
+Description: SELinux runtime shared libraries
+ This package provides the shared libraries for Security-enhanced
+ Linux that provides interfaces (e.g. library functions for the
+ SELinux kernel APIs like getcon(), other support functions like
+ getseuserbyname()) to SELinux-aware applications. Security-enhanced
+ Linux is a patch of the Linux kernel and a number of utilities with
+ enhanced security functionality designed to add mandatory access
+ controls to Linux.  The Security-enhanced Linux kernel contains new
+ architectural components originally developed to improve the security
+ of the Flask operating system. These architectural components provide
+ general support for the enforcement of many kinds of mandatory access
+ control policies, including those based on the concepts of Type
+ Enforcement, Role-based Access Control, and Multi-level Security.
+ .
+ libselinux1 provides an API for SELinux applications to get and set
+ process and file security contexts and to obtain security policy
+ decisions.  Required for any applications that use the SELinux
+ API. libselinux may use the shared libsepol to manipulate the binary
+ policy if necessary (e.g. to downgrade the policy format to an older
+ version supported by the kernel) when loading policy.
+Homepage: http://userspace.selinuxproject.org/
+Original-Maintainer: Debian SELinux maintainers <selinux-devel@lists.alioth.debian.org>
+
+Package: libaudit-common
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 44
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: all
+Multi-Arch: foreign
+Source: audit
+Version: 1:2.3.2-2ubuntu1
+Replaces: libaudit0, libaudit1 (<< 1:2.2.1-2)
+Breaks: libaudit0, libaudit1 (<< 1:2.2.1-2)
+Conffiles:
+ /etc/libaudit.conf cdc703f9d27f0d980271a9e95d0f18b2
+Description: Dynamic library for security auditing - common files
+ The audit-libs package contains the dynamic libraries needed for
+ applications to use the audit framework. It is used to monitor systems for
+ security related events.
+ .
+ This package contains the libaudit.conf configuration file and the associated
+ manpage.
+Homepage: http://people.redhat.com/sgrubb/audit/
+Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+
+Package: libc6
+Status: install ok installed
+Priority: required
+Section: libs
+Installed-Size: 9254
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: eglibc
+Version: 2.19-0ubuntu6
+Replaces: libc6-i386, libc6-xen
+Provides: glibc-2.19-1, libc6-i686, libc6-xen
+Depends: libgcc1
+Suggests: glibc-doc, debconf | debconf-2.0, locales
+Breaks: hurd (<< 1:0.5.git20140203-1), nscd (<< 2.19)
+Conflicts: libc6-xen, prelink (<= 0.0.20090311-1), tzdata (<< 2007k-1), tzdata-etch
+Conffiles:
+ /etc/ld.so.conf.d/i686-linux-gnu.conf 1c63da36f33ec6647af1d8faff9b9795
+Description: Embedded GNU C Library: Shared libraries
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+Homepage: http://www.eglibc.org
+Original-Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
+
+Package: libpng12-0
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 308
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: same
+Source: libpng
+Version: 1.2.50-1ubuntu2
+Replaces: libpng12-dev (<= 1.2.8rel-7)
+Depends: libc6 (>= 2.11), zlib1g (>= 1:1.1.4)
+Pre-Depends: multiarch-support
+Conflicts: libpng12-dev (<= 1.2.8rel-7), mzscheme (<= 1:209-5), pngcrush (<= 1.5.10-2), pngmeta (<= 1.11-3), povray-3.5 (<= 3.5.0c-10), qemacs (<= 0.3.1-5)
+Description: PNG library - runtime
+ libpng is a library implementing an interface for reading and writing
+ PNG (Portable Network Graphics) format files.
+ .
+ This package contains the runtime library files needed to run software
+ using libpng.
+Homepage: http://libpng.org/pub/png/libpng.html
+Original-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+
+Package: udev
+Status: install ok installed
+Priority: important
+Section: admin
+Installed-Size: 5119
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Source: systemd
+Version: 204-10ubuntu1
+Depends: libacl1 (>= 2.2.51-8), libblkid1 (>= 2.19.1), libc6 (>= 2.17), libcgmanager0, libdbus-1-3 (>= 1.0.2), libkmod2 (>= 5~), libnih-dbus1 (>= 1.0.0), libnih1 (>= 1.0.0), libselinux1 (>= 2.0.65), libudev1 (= 204-10ubuntu1), sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.16), lsb-base (>= 3.0-6), util-linux (>= 2.16), procps
+Pre-Depends: debconf (>= 1.4.69) | debconf-2.0
+Breaks: consolekit (<< 0.4.6-1)
+Conffiles:
+ /etc/udev/udev.conf ae415f84e2967eff580089fb08aa0a61
+ /etc/init.d/udev b1cab2570af69ccbf49a208799af6247
+ /etc/init.d/udev-finish 6eac2544228b88cbe8cede182082f46a
+ /etc/init/udev-fallback-graphics.conf b8bfe7164e10cd0e53494b243c5728b1
+ /etc/init/udevtrigger.conf 651ff2421dde80be7ce7ccbf7fa8cf18
+ /etc/init/udev-finish.conf 5c953c5b98ccfbb2a02985bfa2f80aed
+ /etc/init/udev.conf 41c0081f3a830e0902aaff76a53edf98
+ /etc/init/udevmonitor.conf b541dfb5aa4958e9a5336ecaec00ca15
+ /etc/modprobe.d/fbdev-blacklist.conf 01cd03c88ce6821c03baf904f7dfcbd0
+ /etc/udev/rules.d/README 3b6de9f3f911176734c66903b4f8735c obsolete
+Description: /dev/ and hotplug management daemon
+ udev is a daemon which dynamically creates and removes device nodes from
+ /dev/, handles hotplug events and loads drivers at boot time.
+Homepage: http://www.freedesktop.org/wiki/Software/systemd
+Original-Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
+
+Package: util-linux
+Essential: yes
+Status: install ok installed
+Priority: required
+Section: utils
+Installed-Size: 1554
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 2.20.1-5.1ubuntu20
+Replaces: e2fsprogs, fdisk, fstrim, linux32, miscutils, schedutils, setterm, sparc-utils
+Provides: linux32, schedutils
+Depends: lsb-base (>= 3.0-6), tzdata (>= 2006c-2), dpkg (>= 1.15.4) | install-info, debconf (>= 0.5) | debconf-2.0, sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.16)
+Pre-Depends: libblkid1 (>= 2.20.1), libc6 (>= 2.15), libncurses5 (>= 5.5-5~), libselinux1 (>= 1.32), libslang2 (>= 2.2.4), libtinfo5, libuuid1 (>= 2.16), zlib1g (>= 1:1.1.4)
+Suggests: util-linux-locales, kbd | console-tools, dosfstools
+Conflicts: console-tools (<< 1:0.2.3-21), fdisk, fstrim, kbd (<< 1.05-3), linux32, schedutils, setterm
+Conffiles:
+ /etc/cron.weekly/fstrim 4de5cd1aac392609593296f0d81e7595
+ /etc/init/hwclock.conf 132aa3db7e5a8cf55168e4866052208a
+ /etc/init/hwclock-save.conf 4a002046525e338fc23e4418602865c9
+Description: Miscellaneous system utilities
+ This package contains a number of important utilities, most of which
+ are oriented towards maintenance of your system.  Some of the more
+ important utilities included in this package allow you to partition
+ your hard disk, view kernel messages, and create new filesystems.
+Homepage: http://userweb.kernel.org/~kzak/util-linux/
+Original-Maintainer: LaMont Jones <lamont@debian.org>
+
+Package: cpio
+Status: install ok installed
+Priority: important
+Section: utils
+Installed-Size: 312
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: i386
+Multi-Arch: foreign
+Version: 2.11+dfsg-2ubuntu1
+Replaces: cpio-mt
+Depends: libc6 (>= 2.17)
+Suggests: libarchive1
+Conflicts: cpio-mt, mt-st (<< 0.6)
+Description: GNU cpio -- a program to manage archives of files
+ GNU cpio is a tool for creating and extracting archives, or copying
+ files from one place to another.  It handles a number of cpio formats
+ as well as reading and writing tar files.
+Homepage: http://www.gnu.org/software/cpio/
+Original-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+
diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list
index 40bf81a39..1487afd55 100755
--- a/test/integration/test-apt-cli-list
+++ b/test/integration/test-apt-cli-list
@@ -49,9 +49,11 @@ 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...
+bar/now 1.0 i386 [installed,local]
+
 foobar/unstable 2.0 i386 [upgradable from: 1.0]
 foobar/now 1.0 i386 [installed,upgradable to: 2.0]
-" apt list foobar --all-versions
+" apt list bar foobar --all-versions
 
 testequal "Listing...
 bar/now 1.0 i386 [installed,local]
@@ -68,4 +70,7 @@ 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
 
-
+# test format strings for machine parseable output
+apt list -qq bar baz  -o APT::Cmd::use-format=true  -o APT::Cmd::format="\${Package} - \${installed:Version} - \${candidate:Version}" > output.txt
+testequal "bar - 1.0 - 1.0
+baz - 0.1 - 2.0" cat output.txt
diff --git a/test/integration/test-apt-cli-search b/test/integration/test-apt-cli-search
index 58613717b..8f009d57c 100755
--- a/test/integration/test-apt-cli-search
+++ b/test/integration/test-apt-cli-search
@@ -15,7 +15,10 @@ fi
 
 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 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR
+ Long description of stuff and such, with lines
+ .
+ and paragraphs and everything."
 insertpackage 'testing' 'bar' 'i386' '2.0' '' '' "$DESCR2"
 
 setupaptarchive
@@ -33,16 +36,42 @@ foo/unstable 1.0 all
 testequal "foo/unstable 1.0 all
   $DESCR
 " apt search -qq xxyyzz
+testempty apt search -qq --names-only xxyyzz
+
+# search name
+testequal "foo/unstable 1.0 all
+  $DESCR
+" apt search -qq foo
+testequal "foo/unstable 1.0 all
+  $DESCR
+" apt search -qq --names-only foo
 
 # search with multiple words is a AND search
 testequal "foo/unstable 1.0 all
   $DESCR
 " apt search -qq aabbcc xxyyzz
+testequal "foo/unstable 1.0 all
+  $DESCR
+" apt search -qq 'a+b+c+' 'i*xxy{0,2}zz'
 
 # search is not case-sensitive by default
 testequal "foo/unstable 1.0 all
   $DESCR
 " apt search -qq uppercase
+testequal "foo/unstable 1.0 all
+  $DESCR
+" apt search -qq 'up[pP]erc[Aa]se'
+
+# search is done in the long description
+testequal "foo/unstable 1.0 all
+  $DESCR
+" apt search -qq 'long description'
+testequal "foo/unstable 1.0 all
+  $DESCR
+  Long description of stuff and such, with lines
+  .
+  and paragraphs and everything.
+" apt search --full -qq 'long description'
 
 # output is sorted and search word finds both package
 testequal "bar/testing 2.0 i386
diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog
index d64a09bd6..179e75b35 100755
--- a/test/integration/test-apt-get-changelog
+++ b/test/integration/test-apt-get-changelog
@@ -28,9 +28,8 @@ testsuccess aptget changelog apt -d
 testfileequal 'apt.changelog' "$(cat  aptarchive/pool/apt_1.0/changelog)"
 rm apt.changelog aptarchive/pool/apt_1.0/changelog
 
-aptget changelog apt -qq -o APT::Changelogs::Server='http://not-on-the-main-server:8080/' > apt.changelog
-testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0.changelog)"
-rm apt.changelog
+testequal "$(cat aptarchive/pool/apt_1.0.changelog)" aptget changelog apt \
+	-qq -o APT::Changelogs::Server='http://not-on-the-main-server:8080/'
 
 testsuccess aptget changelog apt -d
 testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0.changelog)"
diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index 6505b5956..c749224ca 100755
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -9,31 +9,67 @@ configarchitecture "i386"
 
 changetohttpswebserver
 
-echo "foo" > aptarchive/foo
+test_apt_helper_download() {
+    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 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 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 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
+    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'
+    testfileequal foo5.FAILED 'foo'
+}
+
+test_apt_helper_detect_proxy() {
+    # no proxy
+    testequal "Using proxy '' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
+
+
+    # http auto detect proxy script
+    cat > apt-proxy-detect <<'EOF'
+#!/bin/sh -e
+echo "http://some-proxy"
+EOF
+    chmod 755 apt-proxy-detect
+    echo "Acquire::http::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
+    
+    testequal "Using proxy 'http://some-proxy' for URL 'http://www.example.com/'" apthelper auto-detect-proxy http://www.example.com
+
+
+    # https auto detect proxy script
+    cat > apt-proxy-detect <<'EOF'
+#!/bin/sh -e
+echo "https://https-proxy"
+EOF
+    chmod 755 apt-proxy-detect
+    echo "Acquire::https::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
+    
+    testequal "Using proxy 'https://https-proxy' for URL 'https://ssl.example.com/'" apthelper auto-detect-proxy https://ssl.example.com 
+
+
+    
+}
+
+test_apt_helper_download
+test_apt_helper_detect_proxy
+
diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd
index 9d250e949..d72e7e72d 100755
--- a/test/integration/test-apt-progress-fd
+++ b/test/integration/test-apt-progress-fd
@@ -33,6 +33,22 @@ testsuccess aptget install testing=0.8.15 -y -o APT::Status-Fd=3
 testequal "dlstatus:1:0:Retrieving file 1 of 1
 dlstatus:1:0:Retrieving file 1 of 1
 pmstatus:dpkg-exec:0:Running dpkg
+pmstatus:testing:0:Installing testing (amd64)
+pmstatus:testing:20:Preparing testing (amd64)
+pmstatus:testing:40:Unpacking testing (amd64)
+pmstatus:testing:60:Preparing to configure testing (amd64)
+pmstatus:dpkg-exec:60:Running dpkg
+pmstatus:testing:60:Configuring testing (amd64)
+pmstatus:testing:80:Configuring testing (amd64)
+pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log
+
+# reinstall
+exec 3> apt-progress.log
+testsuccess aptget install testing=0.8.15 --reinstall -y -o APT::Status-Fd=3
+testequal "dlstatus:1:0:Retrieving file 1 of 1
+dlstatus:1:0:Retrieving file 1 of 1
+pmstatus:dpkg-exec:0:Running dpkg
+pmstatus:testing:0:Installing testing (amd64)
 pmstatus:testing:20:Preparing testing (amd64)
 pmstatus:testing:40:Unpacking testing (amd64)
 pmstatus:testing:60:Preparing to configure testing (amd64)
diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error
index 96d66371a..a47095b9b 100755
--- a/test/integration/test-apt-progress-fd-error
+++ b/test/integration/test-apt-progress-fd-error
@@ -18,5 +18,10 @@ setupaptarchive
 exec 3> apt-progress.log
 testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3
 msgtest "Ensure correct error message"
-grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb :40:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log && msgpass || (cat apt-progress.log && msgfail)
+if grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb:40:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log; then
+	msgpass
+else
+	cat apt-progress.log
+	msgfail
+fi
 
diff --git a/test/integration/test-architecture-specification-parsing b/test/integration/test-architecture-specification-parsing
index a43354871..d1f6011de 100755
--- a/test/integration/test-architecture-specification-parsing
+++ b/test/integration/test-architecture-specification-parsing
@@ -13,10 +13,10 @@ buildsimplenativepackage 'pkg-arch-foo' "$NATIVE" '1.0' 'stable' "Build-Depends:
 Depends: foo [${NATIVE} !${NATIVE}]"
 buildsimplenativepackage 'pkg-arch-no-foo' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!${NATIVE} ${NATIVE}]
 Depends: foo [!${NATIVE} ${NATIVE}]"
-buildsimplenativepackage 'pkg-arch-foo-unrelated-no' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!kfreebsd-any ${NATIVE}]
-Depends: foo [!kfreebsd-any ${NATIVE}]"
-buildsimplenativepackage 'pkg-arch-foo-unrelated-no2' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [${NATIVE} !kfreebsd-any]
-Depends: foo [${NATIVE} !kfreebsd-any]"
+buildsimplenativepackage 'pkg-arch-foo-unrelated-no' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!someos-any ${NATIVE}]
+Depends: foo [!someos-any ${NATIVE}]"
+buildsimplenativepackage 'pkg-arch-foo-unrelated-no2' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [${NATIVE} !someos-any]
+Depends: foo [${NATIVE} !someos-any]"
 buildsimplenativepackage 'no-depends' 'armel' '1.0' 'stable' 'Build-Depends: foo [armeb], bar [arm]
 Depends: foo [armeb], bar [arm]'
 
diff --git a/test/integration/test-bug-753297-upgradable b/test/integration/test-bug-753297-upgradable
new file mode 100755
index 000000000..068704b3e
--- /dev/null
+++ b/test/integration/test-bug-753297-upgradable
@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'i386'
+
+cat > rootdir/etc/apt/preferences <<EOF
+Package: *
+Pin: release testing
+Pin-Priority: 600
+
+Package: *
+Pin: release unstable
+Pin-Priority: 1
+EOF
+
+insertinstalledpackage 'foo' 'all' '1'
+insertpackage 'testing' 'foo' 'all' '1'
+insertpackage 'testing-updates' 'foo' 'all' '2'
+insertpackage 'unstable' 'foo' 'all' '3'
+
+insertinstalledpackage 'bar' 'all' '1'
+insertpackage 'testing' 'bar' 'all' '2'
+
+setupaptarchive
+
+testequal "Listing...
+bar/testing 2 all [upgradable from: 1]" apt list --upgradable
+
+testequal "Listing...
+bar/testing 2 all [upgradable from: 1]
+foo/testing,now 1 all [installed]" apt list
diff --git a/test/integration/test-bug-758153-versioned-provides-support b/test/integration/test-bug-758153-versioned-provides-support
new file mode 100755
index 000000000..2904ae5a1
--- /dev/null
+++ b/test/integration/test-bug-758153-versioned-provides-support
@@ -0,0 +1,137 @@
+#!/bin/sh
+set -e
+
+# dpkg implements versioned provides in commit 5bb02fe80e9f40dcad9703a72f67cf615ff217b5
+# but previous versions seem to allow parsing, working and ignoring it.
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386'
+
+insertinstalledpackage 'webapp' 'all' '1' 'Depends: httpd'
+insertinstalledpackage 'webserver' 'all' '1' 'Provides: httpd'
+
+insertpackage 'unstable' 'webapp' 'all' '2' 'Depends: httpd (>= 2)'
+insertpackage 'unstable' 'webserver' 'amd64' '2' 'Provides: httpd (= 2)'
+insertpackage 'unstable' 'foreign-webserver' 'i386' '2' 'Multi-Arch: foreign
+Provides: httpd (= 2)'
+
+insertpackage 'experimental' 'webapp' 'all' '3' 'Depends: httpd (>= 1.5)'
+insertpackage 'experimental' 'webserver' 'amd64' '3' 'Provides: httpd (= 3)'
+
+insertpackage 'experimental' 'foreign-webserver' 'i386' '4' 'Multi-Arch: foreign
+Provides: httpd (= 4)'
+insertpackage 'experimental' 'cool-webapp' 'all' '4' 'Depends: httpd (>= 4)'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+  webapp webserver
+2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Inst webserver [1] (2 unstable [amd64])
+Inst webapp [1] (2 unstable [all])
+Conf webserver (2 unstable [amd64])
+Conf webapp (2 unstable [all])' aptget dist-upgrade -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+  webapp webserver
+2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Inst webserver [1] (2 unstable [amd64])
+Inst webapp [1] (2 unstable [all])
+Conf webserver (2 unstable [amd64])
+Conf webapp (2 unstable [all])' aptget install webapp webserver -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+  webapp webserver
+2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Inst webserver [1] (2 unstable [amd64])
+Inst webapp [1] (3 experimental [all])
+Conf webserver (2 unstable [amd64])
+Conf webapp (3 experimental [all])' aptget install webapp=3 webserver -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+  webapp webserver
+2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Inst webserver [1] (3 experimental [amd64])
+Inst webapp [1] (2 unstable [all])
+Conf webserver (3 experimental [amd64])
+Conf webapp (2 unstable [all])' aptget install webapp webserver=3 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foreign-webserver:i386
+The following packages will be upgraded:
+  webapp
+1 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst foreign-webserver:i386 (2 unstable [i386])
+Inst webapp [1] (2 unstable [all])
+Conf foreign-webserver:i386 (2 unstable [i386])
+Conf webapp (2 unstable [all])' aptget install webapp foreign-webserver:i386 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foreign-webserver:i386
+The following packages will be upgraded:
+  webapp
+1 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst foreign-webserver:i386 (2 unstable [i386])
+Inst webapp [1] (3 experimental [all])
+Conf foreign-webserver:i386 (2 unstable [i386])
+Conf webapp (3 experimental [all])' aptget install webapp=3 foreign-webserver:i386 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foreign-webserver:i386
+The following packages will be upgraded:
+  webapp
+1 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst foreign-webserver:i386 (4 experimental [i386])
+Inst webapp [1] (2 unstable [all])
+Conf foreign-webserver:i386 (4 experimental [i386])
+Conf webapp (2 unstable [all])' aptget install webapp foreign-webserver:i386=4 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+Some packages could not be installed. This may mean that you have
+requested an impossible situation or if you are using the unstable
+distribution that some required packages have not yet been created
+or been moved out of Incoming.
+The following information may help to resolve the situation:
+
+The following packages have unmet dependencies:
+ cool-webapp : Depends: httpd (>= 4)
+E: Unable to correct problems, you have held broken packages.' aptget install cool-webapp -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+Some packages could not be installed. This may mean that you have
+requested an impossible situation or if you are using the unstable
+distribution that some required packages have not yet been created
+or been moved out of Incoming.
+The following information may help to resolve the situation:
+
+The following packages have unmet dependencies:
+ cool-webapp : Depends: httpd (>= 4)
+E: Unable to correct problems, you have held broken packages.' aptget install cool-webapp foreign-webserver:i386 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  cool-webapp foreign-webserver:i386
+0 upgraded, 2 newly installed, 0 to remove and 2 not upgraded.
+Inst foreign-webserver:i386 (4 experimental [i386])
+Inst cool-webapp (4 experimental [all])
+Conf foreign-webserver:i386 (4 experimental [i386])
+Conf cool-webapp (4 experimental [all])' aptget install cool-webapp foreign-webserver:i386=4 -s
diff --git a/test/integration/test-bug-lp1347721-dpkg-ordering b/test/integration/test-bug-lp1347721-dpkg-ordering
new file mode 100755
index 000000000..cfe7a4df2
--- /dev/null
+++ b/test/integration/test-bug-lp1347721-dpkg-ordering
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+setupaptarchive
+
+# ensure we find a valid ordering
+testsuccess aptget dist-upgrade -s
diff --git a/test/integration/test-dpkg-assert-multi-arch b/test/integration/test-dpkg-assert-multi-arch
index 177d7489b..b3fbbf0eb 100755
--- a/test/integration/test-dpkg-assert-multi-arch
+++ b/test/integration/test-dpkg-assert-multi-arch
@@ -26,15 +26,17 @@ testqualifier() {
 	fi
 }
 
-# non-multiarch or "ubuntus" old multiarchified dpkg
+msgmsg 'non-multiarch or "ubuntus" old multiarchified dpkg'
 echo 'Dir::Bin::dpkg "./dpkg-wrapper";' > rootdir/etc/apt/apt.conf.d/99dpkgwrapper
-echo '#! /bin/sh
-if echo "$*" | grep -q -- "--assert-multi-arch"; then
+cat > ./dpkg-wrapper <<EOF
+#! /bin/sh
+if echo "\$*" | grep -q -- "--assert-multi-arch"; then
 	echo >&2 'dpkg: Fehler: unbekannte Option --assert-multi-arch'
 	echo >&1 'dpkg: Info: unbekannte Option --assert-multi-arch'
-	return 2;
+	exit 2
 fi
-return $*' > ./dpkg-wrapper
+exec "\$@"
+EOF
 chmod +x ./dpkg-wrapper
 
 testqualifier 'native-pkg' 'native-pkg'
@@ -61,16 +63,18 @@ testqualifier 'all-foreign-pkg-' 'all-foreign-pkg'
 testqualifier 'always-all-pkg-' 'always-all-pkg'
 testqualifier 'always-all-foreign-pkg-' 'always-all-foreign-pkg'
 
-# multiarch dpkg (new interface version)
-
+msgmsg 'multiarch dpkg (new interface version)'
 rm rootdir/var/lib/dpkg/status
 touch rootdir/var/lib/dpkg/status
 echo 'Dir::Bin::dpkg "./dpkg-wrapper";' > rootdir/etc/apt/apt.conf.d/99dpkgwrapper
-echo '#! /bin/sh
-if echo "$*" | grep -q -- "--assert-multi-arch"; then
-	return 0;
+cat > ./dpkg-wrapper <<EOF
+#! /bin/sh
+if echo "\$*" | grep -q -- "--assert-multi-arch"; then
+	exit 0
 fi
-return $*' > ./dpkg-wrapper
+exec "\$@"
+EOF
+chmod +x ./dpkg-wrapper
 
 testqualifier 'native-pkg' 'native-pkg:amd64'
 testqualifier 'native-pkg:amd64' 'native-pkg:amd64'
diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol
index 09230d383..07d2441b6 100755
--- a/test/integration/test-external-dependency-solver-protocol
+++ b/test/integration/test-external-dependency-solver-protocol
@@ -51,6 +51,12 @@ rm -f /tmp/dump.edsp
 testfailure aptget install --solver dump awesomecoolstuff:i386 -s
 testsuccess test -s /tmp/dump.edsp
 
+testsuccess aptget dist-upgrade -s
+testsuccess aptget dist-upgrade -s --solver apt
+
+testsuccess aptget upgrade -s
+testsuccess aptget upgrade -s --solver apt
+
 configarchitecture 'armel'
 msgtest 'Test direct calling is okay for' 'apt-internal-solver'
 cat /tmp/dump.edsp | aptinternalsolver > solver.result 2>&1 || true
diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
index 7112d2b45..a773660d2 100755
--- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
+++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
@@ -16,13 +16,11 @@ setupaptarchive
 changetowebserver -o 'aptwebserver::overwrite::.*::filename=/knights'
 
 msgtest 'Acquire test file from the webserver to check' 'overwrite'
-echo '601 Configuration
-Config-Item: Acquire::http::DependOnSTDIN=0
-
-600 Acquire URI
-URI: http://localhost:8080/holygrail
-Filename: knights-talking
-' | ${METHODSDIR}/http >/dev/null 2>&1 && msgpass || msgfail
+if downloadfile http://localhost:8080/holygrail ./knights-talking >/dev/null; then
+    msgpass
+else
+    msgfail
+fi
 testfileequal knights-talking 'ni ni ni'
 
 ensure_n_canary_strings_in_dir() {
diff --git a/test/libapt/commandline_test.cc b/test/libapt/commandline_test.cc
index 26e80bfde..e403a28c8 100644
--- a/test/libapt/commandline_test.cc
+++ b/test/libapt/commandline_test.cc
@@ -56,3 +56,32 @@ TEST(CommandLineTest,Parsing)
    EXPECT_TRUE(c.FindB("Test::Worked", false));
    EXPECT_FALSE(c.FindB("Test::Zero", false));
 }
+
+TEST(CommandLineTest, BoolParsing)
+{
+   CommandLine::Args Args[] = {
+      { 't', 0, "Test::Worked", 0 },
+      {0,0,0,0}
+   };
+   ::Configuration c;
+   CommandLine CmdL(Args, &c);
+
+   // the commandline parser used to use strtol() on the argument
+   // to check if the argument is a boolean expression - that
+   // stopped after the "0". this test ensures that we always check 
+   // that the entire string was consumed by strtol
+   {
+   char const * argv[] = { "show", "-t", "0ad" };
+   bool res = CmdL.Parse(sizeof(argv)/sizeof(char*), argv);
+   EXPECT_TRUE(res);
+   ASSERT_EQ(std::string(CmdL.FileList[0]), "0ad");
+   }
+
+   {
+   char const * argv[] = { "show", "-t", "0", "ad" };
+   bool res = CmdL.Parse(sizeof(argv)/sizeof(char*), argv);
+   EXPECT_TRUE(res);
+   ASSERT_EQ(std::string(CmdL.FileList[0]), "ad");
+   }
+
+}
diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc
index 1e0afb66c..52eac8232 100644
--- a/test/libapt/parsedepends_test.cc
+++ b/test/libapt/parsedepends_test.cc
@@ -23,7 +23,7 @@ static void parseDependency(bool const StripMultiArch,  bool const ParseArchFlag
       "libdb-dev:any, "
       "gettext:native (<= 0.12), "
       "libcurl4-gnutls-dev:native | libcurl3-gnutls-dev (>> 7.15.5), "
-      "debiandoc-sgml, "
+      "docbook-xml, "
       "apt (>= 0.7.25), "
       "not-for-me [ !amd64 ], "
       "only-for-me [ amd64 ], "
@@ -82,7 +82,7 @@ static void parseDependency(bool const StripMultiArch,  bool const ParseArchFlag
    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("docbook-xml", Package);
    EXPECT_EQ("", Version);
    EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op);
 
diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc
index bc004fd66..194c9c074 100644
--- a/test/libapt/strutil_test.cc
+++ b/test/libapt/strutil_test.cc
@@ -19,6 +19,21 @@ TEST(StrUtilTest,DeEscapeString)
    EXPECT_EQ("foo\\ x", DeEscapeString("foo\\\\ x"));
    EXPECT_EQ("\\foo\\", DeEscapeString("\\\\foo\\\\"));
 }
+TEST(StrUtilTest,StringStrip)
+{
+   EXPECT_EQ("", APT::String::Strip(""));
+   EXPECT_EQ("foobar", APT::String::Strip("foobar"));
+   EXPECT_EQ("foo bar", APT::String::Strip("foo bar"));
+
+   EXPECT_EQ("", APT::String::Strip("  "));
+   EXPECT_EQ("", APT::String::Strip(" \r\n   \t "));
+
+   EXPECT_EQ("foo bar", APT::String::Strip("foo bar "));
+   EXPECT_EQ("foo bar", APT::String::Strip("foo bar \r\n \t "));
+   EXPECT_EQ("foo bar", APT::String::Strip("\r\n \t foo bar"));
+   EXPECT_EQ("bar foo", APT::String::Strip("\r\n \t bar foo \r\n \t "));
+   EXPECT_EQ("bar \t\r\n foo", APT::String::Strip("\r\n \t bar \t\r\n foo \r\n \t "));
+}
 TEST(StrUtilTest,StringSplitBasic)
 {
    std::vector<std::string> result = StringSplit("", "");
@@ -70,3 +85,38 @@ TEST(StrUtilTest,EndsWith)
    EXPECT_FALSE(Endswith("abcd", "x"));
    EXPECT_FALSE(Endswith("abcd", "abcndefg"));
 }
+TEST(StrUtilTest,SubstVar)
+{
+   EXPECT_EQ("", SubstVar("", "fails", "passes"));
+   EXPECT_EQ("test ", SubstVar("test fails", "fails", ""));
+   EXPECT_EQ("test passes", SubstVar("test passes", "", "fails"));
+
+   EXPECT_EQ("test passes", SubstVar("test passes", "fails", "passes"));
+   EXPECT_EQ("test passes", SubstVar("test fails", "fails", "passes"));
+
+   EXPECT_EQ("starts with", SubstVar("beginnt with", "beginnt", "starts"));
+   EXPECT_EQ("beginnt with", SubstVar("starts with", "starts", "beginnt"));
+   EXPECT_EQ("is in middle", SubstVar("is in der middle", "in der", "in"));
+   EXPECT_EQ("is in der middle", SubstVar("is in middle", "in", "in der"));
+   EXPECT_EQ("does end", SubstVar("does enden", "enden", "end"));
+   EXPECT_EQ("does enden", SubstVar("does end", "end", "enden"));
+
+   EXPECT_EQ("abc", SubstVar("abc", "d", "a"));
+   EXPECT_EQ("abc", SubstVar("abd", "d", "c"));
+   EXPECT_EQ("abc", SubstVar("adc", "d", "b"));
+   EXPECT_EQ("abc", SubstVar("dbc", "d", "a"));
+
+   EXPECT_EQ("b", SubstVar("b", "aa", "a"));
+   EXPECT_EQ("bb", SubstVar("bb", "aa", "a"));
+   EXPECT_EQ("bbb", SubstVar("bbb", "aa", "a"));
+
+   EXPECT_EQ("aa", SubstVar("aaaa", "aa", "a"));
+   EXPECT_EQ("aaaa", SubstVar("aa", "a", "aa"));
+   EXPECT_EQ("aaaa", SubstVar("aaaa", "a", "a"));
+   EXPECT_EQ("a a a a ", SubstVar("aaaa", "a", "a "));
+
+   EXPECT_EQ(" bb bb bb bb ", SubstVar(" a a a a ", "a", "bb"));
+   EXPECT_EQ(" bb bb bb bb ", SubstVar(" aaa aaa aaa aaa ", "aaa", "bb"));
+   EXPECT_EQ(" bb a bb a bb a bb ", SubstVar(" aaa a aaa a aaa a aaa ", "aaa", "bb"));
+
+}
diff --git a/vendor/makefile b/vendor/makefile
index 0701a03eb..ebf5787c8 100644
--- a/vendor/makefile
+++ b/vendor/makefile
@@ -5,7 +5,7 @@ SUBDIR=vendor
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
-all headers library binary program doc manpages debiandoc test update-po startup dirs: current
+all headers library binary program doc manpages docbook test update-po startup dirs: current
 all: all/subdirs
 binary: binary/subdirs
 doc: doc/subdirs